Zip import fail events should not themselves fail.
Merge remote-tracking branch 'origin/master'