Merge branch 'TINKERPOP-1989' into tp32