applied e3b448f as patch (cf. Issue #621)
Merge branch 'v1.4.x' of github.com:rethinkdb/rethinkdb into v1.4.x