[sr-dev] git:master:8d5ea6fb: Merge pull request #2238 from btriller/doc-fixes