Apply PHP-CS-Fixer
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DependencyInjection/Compiler/AddTemplatesCompilerPass.php