Merge branch 'jc/zlib-wrap'