Fix merge
Merge pull request #480 from rethinkdb/michel_v1.14_fixes

Fix merge in faq