Merge correctly.
Merge branch 'develop' into develop.ontohub.org