Merge branch 'upstream-zlib' into update-zlib

# By zlib upstream
* upstream-zlib:
  zlib 2011-09-09 (abf180a0)