updated due to changes in Symfony 2.3
Merged upgrade from Symfony 2.3