removed rdf
Merge branch 'refs/heads/1.7'