Merge branch 'issue195_populate_dns_on_start' into weavedns_restartable

Conflicts:
	weave