Fix bug in setup.py
Merge remote-tracking branch 'origin/master' into devel