Cleaner conversion of RDF values
Merge master