Fix zip creation.
rebase of jburel's d2b7c42
Merge pull request #1089 from mtbc/pr1056-rebase

Fix zip creation.