Merge zlib double-free bug forwarded by Mark J Cox.