Dump CNAME records as comments
Merge branch 'hosts-cache-option' into guns

* hosts-cache-option:
  Dump CNAME records as comments