Tried commenting out variable name instead of using UNUSED.
Merge branch 'sam_203' of github.com:rethinkdb/rethinkdb into sam_203