Merge branch 'master' into 1.6

Conflicts:
	Acl/Controller/Component/Auth/AclCachedAuthorize.php