Merge pull request #2069 from octo/issue/2067