Merge branch 'master' of git://ctrl.tukaani.org/xz