Merge branch 'master' of ssh://git.eclipse.org:29418/epsilon/org.eclipse.epsilon