fix
Merge remote-tracking branch 'origin/security' into security

Conflicts:
	web/app_dev.php
Merge remote-tracking branch 'origin/security' into security