Auto-Merge pull request #2553 from octo/cid/179230