Log Message: Merge 64333cef68d7bcc67bef6ecf177fbeaa549b9139 from upstream to unbreak build without zlib.