Merge #10694: zipfile now ignores garbage at the end of a zipfile.