Ported tinkerpop/blueprints@39c4aa9, tinkerpop/blueprints@528b808, tinkerpop/blueprints@ad30dbd, tinkerpop/blueprints@badd833
Merge commit 'fa949ddc4b923b755d580f2c095c3a9b14d90f71'