Auto-Merge pull request #2538 from octo/cid/179244