Merge branch 'master' into prequery

diff --cc pdns/lua-recursor.cc
Simple merge

diff --cc pdns/pdns_recursor.cc
Simple merge

diff --cc pdns/powerdns-example-script.lua
Simple merge

diff --cc pdns/syncres.hh
Simple merge