Merge branch 'zlib-1-2-12' into 'master'

Upgrade zlib to 1.2.12

See merge request !21
7 jobs for master in 61 minutes and 32 seconds (queued for 4 seconds)
latest