Auto-Merge pull request #2575 from octo/cid/37934