Merge pull request #3060 from octo/issue/2973