Merge branch 'setup.py-cleanup' into 'master'

Clean up setup.py

See merge request !26
18 jobs for master in 3 minutes and 17 seconds (queued for 7 seconds)
latest