Merge branch 'zlib-support' into updates