Merge remote-tracking branch 'origin/master' into rec-axfr-timeout

diff --cc pdns/reczones.cc
index 50e489efc1e76f50d9ff37931c626e9bc0bff722,3198f80992f714c7254f7e4e5d192c5ce3ad1d9b..60ef9c87a10372bfe11f5368c37ff23da7435648
--- 1/pdns/reczones.cc
--- 2/pdns/reczones.cc
+++ b/pdns/reczones.cc
@@@ -326,9 -326,9 +326,9 @@@ void RPZIXFRTracker(const ComboAddress
  
    while (!sr) {
      try {
-       sr = loadRPZFromServer(master, zoneName, zone, defpol, maxTTL, tt, maxReceivedBytes, localAddress, axfrTimeout);
-       if(refresh) {
-         sr->d_st.refresh=refresh;
 -      sr=loadRPZFromServer(master, zoneName, zone, defpol, maxTTL, tt, maxReceivedBytes, localAddress);
++      sr=loadRPZFromServer(master, zoneName, zone, defpol, maxTTL, tt, maxReceivedBytes, localAddress, axfrTimeout);
+       if(refresh == 0) {
+         refresh = sr->d_st.refresh;
        }
        zone->setSerial(sr->d_st.serial);
      }