Auto-Merge pull request #2549 from octo/cid/179240