Merge branch 'master' into HEAD

Conflicts:
	ontologies/catalog-v001.xml