Merge from trunk

git-svn-id: https://svn.apache.org/repos/asf/jena/branches/arq-riot-output@1454416 13f79535-47bb-0310-9956-ffa450edef68