Merge branch 'TINKERPOP-2054' into 3.4-dev