Auto-Merge pull request #2546 from octo/cid/179229