Bump version in setup.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	setup.py