Fixed: Layout issue
Merge branch '1.1.x' into develop
Fixed: SQL user hosts must be separated from SQL users to avoid any customer confusion
Small fixes
Merge branch '1.1.x' into develop

Conflicts:
	CHANGELOG