Merge branch 'TINKERPOP-3030' into 3.6-dev