Auto-Merge pull request #2952 from octo/issue/2951