Merge "Docs: Fixing bad merge."