Change zlib branch to match fixes. DROP THIS COMMIT ON MASTER