Fix for zip utilities test randomly failing on travis
Merge remote-tracking branch 'origin/master'