Merge branch '2122_y2k_bug_in_zip'