Merge branch 'master' into development

Conflicts:
	karma/preloaded-ontologies/dig-ontology.ttl