Merge tag 'v2.3.17' of github.com:symfony/symfony-standard into 2.3

Conflicts:
	README.md