Merge commit 'refs/pull/634/head' of github.com:apache/jena into thrift-update