Merge "Fix bug in writing zips."