Cherry-pick 68a31177aa3741f6d921f73fa22d5ea591ba452f
Add keymaps for Linux and Windows. Sorry 'bout that, non-OSX users.
Merge master. Fix conflicts