Merge branch 'TINKERPOP-2323' into 3.3-dev