Synced with symfony/symfony-standard v2.3.4