Handle a 'null' response from the driver
Merge branch 'next' into michel_null_cursor
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next