Fix typo with $option(s)
Change menu twig function to SimpleFunction
Merge branch 'master' into v3.0-dev