Auto-Merge pull request #2580 from octo/cid/179235