Try to merge across changes in zlib from 1.1.2 to 1.1.3.