Walk back and re-do with 2 shortcuts, for #664
Merge branch 'master' of https://github.com/ceylon/ceylon-ide-eclipse