Revisited our policy on enabling/disabling menus.

The idea is that a menu should always be enabled. It's just its items
which should be enabled/disabled as needed.
Merge branch 'master' into issue31