Merge pull request #1876 from octo/issue/1819