Issue #5784: Merge zlib from 3.5