Merge branch 'wsmenu'.

Improved handling of menu boxes (see the branch' commit messages).
Fix config.h.def.

I forgot that this one needs to get updated, too.
Merge branch 'master' into wsmenu.

Bugfix for config.def.h.