Merge pull request #1892 from apache/TINKERPOP-2816-3.5

TINKERPOP-2816 for 3.5