Merge branch 'master' of ssh://git.eclipse.org/gitroot/emf-store/org.eclipse.emf.emfstore.other