Merge branch 'TINKERPOP-2479' into 3.4-dev