Auto-Merge pull request #2589 from octo/cid/37960