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