merge cm-10.1 changes: Update for zlib changes