Merge pull request #638 from wymeditor/lessGlobalPollution

Closes #638 Less global pollution
Merge branch 'master' into kb-shortcuts