Sync With FriendsOfSymfony/FOSUserBundle