Merge pull request #985 from kenyon/patch-2