Merge "Really sync with bzip1.0.8."