Auto-Merge pull request #2588 from octo/cid/37968