Merge from vendor branch LIBARCHIVE: