Upgrade to Symfony 2.5