Merge branch 'master' into alias

Conflicts:
	pdns/dnsproxy.cc

diff --cc pdns/dnsproxy.cc
index e674f3d4858ba9bc220f5c83c2f5fe67bf045ba5,611d139d3e5d4c177ee3ddeb5d4ffe539b3a135a..504691286ec025705ae424da70758ff17ce03d5c
--- 1/pdns/dnsproxy.cc
--- 2/pdns/dnsproxy.cc
+++ b/pdns/dnsproxy.cc
@@@ -171,8 -134,7 +171,8 @@@ int DNSProxy::getID_locked(
          L<<Logger::Warning<<"Recursive query for remote "<<
            i->second.remote.toStringWithPort()<<" with internal id "<<n<<
            " was not answered by backend within timeout, reusing id"<<endl;
-       
 +      delete i->second.complete;
+       S.inc("recursion-unanswered");
        }
        return n;
      }

diff --cc pdns/packethandler.cc
Simple merge