Merge branch 'master' into rpz-triggers

diff --cc daemon/worker.c
Simple merge

diff --cc doc/example.conf.in
Simple merge

diff --cc doc/unbound.conf.5.in
Simple merge

diff --cc iterator/iterator.c
Simple merge

diff --cc services/authzone.c
Simple merge

diff --cc services/authzone.h
Simple merge

diff --cc util/data/msgreply.c
Simple merge