Merge branch 'master' of github.com:jasny/twig-extensions