JENA-1447: Merge commit 'refs/pull/328/head' of github.com:apache/jena

This closes #328.