keyboard stuff

Merge remote-tracking branch 'origin/master' into develop master


+6 -7
4 changed files