Add option to consolidate menus under one parent
Merge branch 'master' into ST3