Merge changes I5ebbcfd9,Ie719ae30 into emu-master-dev * changes: Merge series of zlib patches from emu-dev Update zlib to latest release