zip log files (optionally)
Merge branch 'master' into zip
Merge branch 'master' into zip