Commit 9b87998c97fedcf0c22cef28bb0839ecd68c1efd

Vicent Marti 2014-07-04T18:49:24

Merge remote-tracking branch 'origin/cmn/update-zlib'