Merge branch 'sparql1.1'