Better-keyboard-navigation into Master

The expression navigation improvement from better-keyboard-navigation is really cool and should be brought into master.