Upgrade to support Symfony 2.4