Correct conflicting keybinding
Merge remote-tracking branch 'bbatsov/master'