Merge branch 'master' into John
new key mappings

new key mappings
Merge branch 'John'