Merge branch 'master' of ssh://khussey@git.eclipse.org/gitroot/uml2/org.eclipse.uml2.git