Fix twig error syntax
Merge branch 'master' into test_travis