Fix a "may be uninitialized" warning in zlib.
Merge branch 'develop' into merge-efficiency