Master 0.16.2

Menu hotkeys fix. See commit message for details.