Merge branch 'TINKERPOP-2264' into tp33