Merge pull request #2122 from octo/issue/2108