Merge remote-tracking branch 'upstream/master'

Conflicts:
	setup.py