Merge tag 'v2.6.0' of github.com:symfony/symfony-standard into develop

created tag 2.6.0

Conflicts:
	README.md
	app/config/config.yml
	app/config/parameters.yml.dist