bug #4209 Missing compression in one case

Signed-off-by: Marc Delisle <marc@infomarc.info>
ChangeLog entry and fix explanation for bug #4209

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge commit '69c24b7'
Fix merge conflicts

Signed-off-by: Marc Delisle <marc@infomarc.info>