keyboard stuff

Merge remote-tracking branch 'upstream/develop' master


+46102 -23203
4364 changed files