Auto-Merge pull request #2555 from octo/cid/179231