Fixes for Symfony 2.6
Branch 2.6
Merge branch '2.6'