upstream 8.5, with zlib removals. Files-Excluded: contrib/ada contrib/amd64 contrib/asm686 contrib/blast contrib/delphi contrib/dotzlib contrib/gcc_gvmat64 contrib/infback9 contrib/inflate86 contrib/iostream contrib/iostream2 contrib/iostream3 contrib/masmx64 contrib/masmx86 contrib/pascal contrib/puff contrib/testzlib contrib/untgz contrib/vstudio doc/rfc1950.txt doc/rfc1951.txt doc/rfc1952.txt win32