Auto-Merge pull request #2586 from octo/issue/2583