Merge branch 'master' of ssh://git.eclipse.org:29418/bpmn2-modeler/org.eclipse.bpmn2-modeler