Fix twig environment#593

mjauvin wants to merge 3 commits intowip/1.2wintercms/winter:wip/1.2from

wip/fix-twig-contextwintercms/winter:wip/fix-twig-contextCopy head branch name to clipboard