Menus are now ordered, so this should make the build green!
Merge remote-tracking branch 'origin/master'