From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Fri, 18 Jan 2019 10:33:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into packet-too-big
X-Git-Tag: auth-4.2.0-beta1~22^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3cad3e1a18c599e090a94f3e4f84b62232846889;p=pdns

Merge remote-tracking branch 'origin/master' into packet-too-big
---

3cad3e1a18c599e090a94f3e4f84b62232846889