Read in /etc/hosts before .hosts
Merge branch 'read-etc-hosts' into next

* read-etc-hosts:
  Read in /etc/hosts before .hosts

Conflicts:
	doc/UPDATES