Fix async handling for zipFolder
Merge remote-tracking branch 'origin/master'