Merge branch 'master' into dnsdist11

diff --cc .travis.yml
index d2e75a4cee5ef007976e7d1d089cfc3ba0644470,4b960292bf460818a0049f997e859f46f3da2fac..8af6bde37513b3baecb7879fd3b23d3ddadc17e6
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -7,8 -7,9 +7,9 @@@ before_script
   - sudo /sbin/ip addr add 10.0.3.0/24 dev lo
   - sudo /sbin/ip addr add 1.2.3.4/32 dev lo
   - sudo rm -f /etc/apt/sources.list.d/travis_ci_zeromq3-source.list
 - - sudo apt-get update --quiet --quiet
 + - sudo apt-get update -qq
   - sudo apt-get install --quiet --quiet --no-install-recommends
+      alien
       authbind
       bc
       bind9utils

diff --cc pdns/Makefile.am
Simple merge