Merge branch 'master' into botan-2

diff --cc pdns/Makefile.am
Simple merge

diff --cc pdns/recursordist/Makefile.am
index ac03127590f21e531bed050c2f84a6ac2b2827c1,582cad65864e1c98c410b875135c2abef60d54b5..7b440bfe56668f20a94c64eca91f4e364cc98c4b
--- 1/pdns/recursordist/Makefile.am
--- 2/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@@ -1,6 -1,6 +1,6 @@@
  JSON11_LIBS = $(top_srcdir)/ext/json11/libjson11.la
  
- AM_CPPFLAGS = $(LUA_CFLAGS) $(YAHTTP_CFLAGS) $(BOOST_CPPFLAGS) $(BOTAN_CFLAGS) $(NET_SNMP_CFLAGS) $(SANITIZER_FLAGS) -O3 -Wall -pthread -DSYSCONFDIR=\"${sysconfdir}\" $(SYSTEMD_CFLAGS)
 -AM_CPPFLAGS = $(LUA_CFLAGS) $(YAHTTP_CFLAGS) $(BOOST_CPPFLAGS) $(BOTAN110_CFLAGS) $(LIBSODIUM_CFLAGS) $(NET_SNMP_CFLAGS) $(SANITIZER_FLAGS) -O3 -Wall -pthread -DSYSCONFDIR=\"${sysconfdir}\" $(SYSTEMD_CFLAGS)
++AM_CPPFLAGS = $(LUA_CFLAGS) $(YAHTTP_CFLAGS) $(BOOST_CPPFLAGS) $(BOTAN_CFLAGS) $(LIBSODIUM_CFLAGS) $(NET_SNMP_CFLAGS) $(SANITIZER_FLAGS) -O3 -Wall -pthread -DSYSCONFDIR=\"${sysconfdir}\" $(SYSTEMD_CFLAGS)
  
  AM_CPPFLAGS += \
        -I$(top_srcdir)/ext/json11 \