[Update] zipzap (6.0)
Merge pull request #7502 from jcouture/master

[Update] zipzap (6.0)