Merge pull request #2975 from octo/issue/2954