Merge branch 'vendor/LIBARCHIVE' (early part)