global opt args
Merge branch 'ql-refactor' of github.com:rethinkdb/rethinkdb into ql-refactor
fixes null test
Merge branch 'ql-refactor' of github.com:rethinkdb/rethinkdb into ql-refactor

Conflicts:
	test/rql_test/src/control.yaml
fix merge errors