Auto-Merge pull request #2563 from octo/cid/179225