Merge pull request #8159 from neheb/xz