CR538
Merge branch '69_js_timeout_ruby' of github.com:rethinkdb/rethinkdb into 69_js_timeout_ruby