Fix modifier keys on root version
Merge branch 'master' into root