Merge pull request #2100 from douglaz/docs_fixes