Updated editor twig from master