Merge branch 'TINKERPOP-2413' into 3.4-dev