Merge "Editing the METADATA file of dnsmasq"