Merge branch 'master' of https://kraev@git.eclipse.org/gitroot/libra/org.eclipse.libra.git