Merge pull request #3339 from jkohen/patch-1