Merge pull request #5569 from neheb/patch-1