Without the hack to make the zfrcors work and _debug depending on env
Merge origin/master

Conflicts:
	config/autoload/user.global.php