Merge pull request #1391 from davvid/macos/hotkeys