Merge branch 'TINKERPOP-3031' into 3.6-dev