Symfony config update 2.3.3
Merge branch 'master' into uberspace

Conflicts:
	web/app.php