Merge pull request #3054 from octo/docs