Merge branch 'master' into TINKERPOP-1278
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0ce35b63
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0ce35b63
Diff: http://git-wip-us.apache.org/repos/asf/tinke
Merge branch 'master' into TINKERPOP-1278
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/292f0243
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/292f0243
Diff: http://git-wip-us.apache.org/repos/asf/tinke