Merge remote-tracking branch 'origin/master' into ixfrdist-limit-size

diff --cc pdns/ixfrdist.cc
index ee974fd8640ec53a14a1c7b4414a35c1a5da07e7,bf7f43c897304891382c0e4d78f09ed9a73882b4..48f26f07008be6df1a6511d9ab78ee796105f053
--- 1/pdns/ixfrdist.cc
--- 2/pdns/ixfrdist.cc
+++ b/pdns/ixfrdist.cc
@@@ -233,7 -234,8 +234,8 @@@ static void updateCurrentZoneInfo(cons
    g_soas[domain] = newInfo;
  }
  
 -void updateThread(const string& workdir, const uint16_t& keep, const uint16_t& axfrTimeout, const uint16_t& soaRetry) {
 +void updateThread(const string& workdir, const uint16_t& keep, const uint16_t& axfrTimeout, const uint16_t& soaRetry, const uint32_t axfrMaxRecords) {
+   setThreadName("ixfrdist/update");
    std::map<DNSName, time_t> lastCheck;
  
    // Initialize the serials we have