fixed crashing bug discovered while fixing issue 579
Merge branch 'v1.4.x' of github.com:rethinkdb/rethinkdb into v1.4.x