Auto-Merge pull request #2566 from octo/pr/2556