Commit bb54fad0452fbcc876c4cfcb42f4590a2cb23be6

Carlos Martín Nieto 2014-06-11T16:36:34

Merge branch 'cmn/zlib-update' into cmn/update-zlib