Merge branch 'TINKERPOP-3035' into 3.6-dev