Merge pull request #7693 from neheb/patch-7