Merge pull request #9625 from Habbie/revert-9552

author Peter van Dijk <peter.van.dijk@powerdns.com>

Tue, 20 Oct 2020 15:34:57 +0000 (17:34 +0200)

committer GitHub <noreply@github.com>

Tue, 20 Oct 2020 15:34:57 +0000 (17:34 +0200)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Tue, 20 Oct 2020 15:34:57 +0000 (17:34 +0200)
committer GitHub <noreply@github.com>
Tue, 20 Oct 2020 15:34:57 +0000 (17:34 +0200)
diff --cc docs/settings.rst
Simple merge
diff --cc pdns/common_startup.cc
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Tue, 20 Oct 2020 15:34:57 +0000 (17:34 +0200)
committer	GitHub <noreply@github.com>
	Tue, 20 Oct 2020 15:34:57 +0000 (17:34 +0200)
		1	2
docs/settings.rst	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/common_startup.cc	patch \|	diff1 \|	diff2 \|	blob \| history