Merge branch 'master' of ssh://git.eclipse.org/gitroot/emfclient/org.eclipse.emf.ecp.other