Merge "Fix unzip timestamps"