rhbz961163 prevent Shift+W g triggering key-shortcut mode
Merge branch 'release' into integration/master