Updated to support Symfony 2.3.1