Merge branch 'TINKERPOP-2947' into 3.6-dev