Auto-Merge pull request #2561 from octo/cid/157643