Merge pull request #247 from fkarpinski/RELEASE-3.0-beta2

Diagram classes
Merge remote-tracking branch 'remotes/origin/RELEASE-2.1-JSP' into RELEASE-3.0-beta2
Merge branch 'RELEASE-3.0-beta2' into RELEASE-2.1-JSP
fix