Merge branch 'update-libarchive' into release