fix the back one word keyboard short cut problem
Merge remote-tracking branch 'origin/master'