Merge branch 'master' into keyEvent
Merge branch 'keyEvent' of github.com:fhinkel/tryM2 into keyEvent