Merge pull request #3061 from octo/docs