[trac899] Merge branch 'master' into trac899
Conflicts: src/bin/resolver/tests/Makefile.am src/lib/config/tests/Makefile.am src/lib/log/tests/Makefile.am src/lib/resolve/tests/Makefile.am src/lib/server_common/tests/Makefile.am tests/tools/badpacket/tests/Makefile.am
This diff is collapsed.