Merging Gilbert's commits to menus
Merge branch 'master' into wt