Merge branch 'master' of ssh://git.eclipse.org/gitroot/krikkit/org.eclipse.krikkit