Backport #6873
authorPieter Lexis <pieter.lexis@powerdns.com>
Thu, 30 Aug 2018 08:45:39 +0000 (10:45 +0200)
committerPieter Lexis <pieter.lexis@powerdns.com>
Thu, 30 Aug 2018 08:45:39 +0000 (10:45 +0200)

Trivial merge