Merge pull request #3357 from tritao/zip_delete_entries