Merge pull request #2488 from Nerei:minor_doc