Merge branch 'master' into tc
Merge branch 'master' into tc
use keyIdentifier instead of keyCode
Merge branch 'tc'