Fix alternative key bindings for switching buffers
Merge branch 'master' into tentative-changes