yet another one of those pesky JS eval problems
Merge branch 'ql-refactor' of github.com:rethinkdb/rethinkdb into ql-refactor
Merge branch 'ql-refactor' of github.com:rethinkdb/rethinkdb into ql-refactor
fixes JS driver func wrap bug
Merge branch 'ql-refactor' of github.com:rethinkdb/rethinkdb into ql-refactor

Conflicts:
	test/rql_test/src/control.yaml