Merge branch 'development' into rdf_dag
Fix for outputting prefixes and namespaces in mapping