Fixes for Symfony 2.6
Branch 2.6
Merge branch 'master' into 2.6