Merge branch 'master' of github.com:rethinkdb/docs
Merge branch 'master' into v1.12.x
Merge branch 'v1.12.x' of github.com:rethinkdb/docs into v1.12.x