Fix bug where the last menus/menus.txt definition was ignored
Merge pull request #995 from dorkster/fixes

Fix bug where the last menus/menus.txt definition was ignored
Merge remote-tracking branch 'upstream/master' into renderdevice