Merge branch 'TINKERPOP-2293' into tp33