Merge from vendor branch ZLIB: