Fix setup.py
Merge branch 'master' into py3