Merge pull request #2783 abostroem/gzip_fix

Conflicts:

	CHANGES.rst