keyboard stuff

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


+4 -4
2 changed files