From: Pieter Lexis <pieterlexis@users.noreply.github.com>
Date: Thu, 1 Jun 2017 09:33:28 +0000 (+0200)
Subject: Merge pull request #5355 from rgacogne/rec40-backport-4924-1988
X-Git-Tag: rec-4.0.5-rc2^0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=79ed38c2911f391f2d588748e5a74cf3815aa26b;p=pdns

Merge pull request #5355 from rgacogne/rec40-backport-4924-1988

rec-4.0.x: Backport #4924 and #4988
---

79ed38c2911f391f2d588748e5a74cf3815aa26b