1496, a bug in rdb_batched_replace
comment
changed return_vals_p to should_return_vals
Merge branch '1496_fix' into next
Cast const string into no-const.

This fixes "deprecated conversion from string constant to ‘char*’ [-Werror=write-strings]" warning

This closes bug #1499
Merge pull request #1500 into next

Closes #1500

Closes #1499

Closes #1484
Merge branch 'next' into sam_97_alt
Merge branch 'sam_97_alt' of github.com:rethinkdb/rethinkdb into sam_97_alt