Merge branch 'm300524-master-patch-57066' into 'master'

Update setup.py

See merge request !3
2 jobs for master in 8 seconds (queued for 4 seconds)