Merge branch 'master' into ontohub.org