Symfony 2.2 dependency
Merge branch 'master' into configuration