Merge remote-tracking branch 'origin/master' into postinstall-services

Conflicts:
	setup.py