Auto-Merge pull request #2559 from octo/cid/179236