Merge branch 'revert-80c11ce1' into 'master'

Revert "Update setup.py, no longer requires README.md for long description"

See merge request !12
8 jobs for master in 14 seconds