fix scopes.php.twig
Merge branch 'master' into mygithub