Synced with symfony/symfony-standard v2.5.2