Merge pull request #3216 from tritao/zip_duplicate_entries