Merge pull request #5682 from neheb/xz