bug #4025 gzip export is not actually compressed with mod_deflate
Fix merge conflicts