Merge pull request #3184 from tritao/zip_datetime