Merge branch 'hotkeys' into GUI