Cleanup
Merge branch '1.1.x' into develop

Conflicts:
	configs/debian/hooks.d/README