Merge branch 'TINKERPOP-2855' into 3.6-dev