Merge @nicferrier doc-patch.