Sync with the symfony standard edition