Merge branch 'vendor/BZIP'