Auto-Merge pull request #2554 from octo/cid/179227