Replaces usage of unzip by adm-zip
Merge branch 'master' into develop