take 2 on setting content-length properly
Merge branch 'mm-zip-to-files' into staging2