fix setup.py for RTD
Merge branch 'develop'