Synced with symfony/symfony-standard v2.4.3