Merge pull request #2883 from neheb/patch-1