Merge 'master', but take geoipbackend from master as

it has diverged tremendously. Followup commits will
restore the geoip interface for LUA.

diff --cc build-scripts/build-auth-rpm
Simple merge

diff --cc docs/conf.py
Simple merge

diff --cc pdns/Makefile.am
Simple merge

diff --cc pdns/dnsbackend.cc
Simple merge

diff --cc pdns/dnsrecords.cc
Simple merge

diff --cc pdns/dnsrecords.hh
Simple merge

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

diff --cc pdns/pdnsutil.cc
Simple merge