Merge branch 'postinstall-services'

Conflicts:
	setup.py
Merge branch 'master' into postinstall-services

Conflicts:
	setup.py