Symfony fixes
Merge branch '4.0' into 4.1

Conflicts:
	composer.json
Symfony fixes