Auto-Merge pull request #2518 from octo/issue/2510