dnsmasq, zlib: merge pending pull reqs #213, #195