Patch from Jos Backus to merge zlib-1.1.4.