Merge branch 'master' of ssh://jschumacher@git.eclipse.org/gitroot/smila/org.eclipse.smila.core.git