Re-adding libz.
Merge pull request #3256 from tpesce/fork

Re-adding libz.