Merge branch 'TINKERPOP-2401' into 3.4-dev