Merge branch 'master' into devel
initial gzip support
--trunk-ok for xpehh
Merge branch 'master' into devel