Merge branch 'mr/gitweb-xz'