Symfony 2.4, Twig 1.15
Merge pull request #791 from derrabus/patch-4

Symfony 2.4, Twig 1.15