Merge pull request #732 from dolphin-emu/revert-683-linux_hotkeys Revert "Fix hotkeys in Linux and Mac OS X"