I really hate setup.py
Merge branch 'develop' into release/1.2.0

Conflicts:
	setup.py