Merge branch 'TINKERPOP-2919' into 3.5-dev