Updated latest master branch for Twig.