Merge pull request #3036 from tritao/windowsbase_zip_datetime