Merge branch 'TINKERPOP-2001' into 3.4-dev