Merge pull request #5154 from neheb/patch-5