Another change of keybindings.
Merge branch 'develop'