fixes #619
adds regression test for 619
Merge branch 'v1.4.x' of github.com:rethinkdb/rethinkdb into v1.4.x
more tests for issue 619 regression test
Merge branch 'v1.4.x' of github.com:rethinkdb/rethinkdb into v1.4.x