merge with function
fixed double-arg evaluation
Merge branch '1345_merge_func' into next
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next