Merge remote-tracking branch 'origin/master' into thread-names

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