svn: r3070 original commit: 67b5c30218c3428f6b57575a99fa85ad68eb08d6
remove-empty-menus', same places as