Merge pull request #5192 from neheb/patch-1