Merge pull request #2085 from tigert/patch-2