Auto-Merge pull request #2565 from octo/cid/37966