Merge branch 'root' of https://github.com/mind04/pdns into mind04-root

diff --cc .travis.yml
Simple merge

diff --cc pdns/backends/gsql/gsqlbackend.cc
Simple merge

diff --cc pdns/dnsbackend.cc
Simple merge

diff --cc pdns/packethandler.cc
Simple merge

diff --cc pdns/tcpreceiver.cc
Simple merge

diff --cc regression-tests/backends/bind-slave
Simple merge