Merge branch 'jl/zlib-restore-nul-termination'