Merge pull request #1684 from Garciat/fix-zlib-helper