Merge branch 'develop' of ssh://git.eclipse.org/gitroot/bpmn2-modeler/org.eclipse.bpmn2-modeler into develop