Auto-Merge pull request #2540 from octo/cid/141009