Merge branch 'upstream-zlib' into update-zlib

* upstream-zlib:
  zlib 2024-01-22 (51b7f2ab)