Merge pull request #962 from kenyon/patch-1