[trac499] Merge branch 'master' into trac499
Conflicts: src/lib/asiolink/Makefile.am src/lib/asiolink/asiolink.cc src/lib/asiolink/internal/iofetch.h src/lib/asiolink/internal/tests/udpdns_unittest.cc src/lib/asiolink/internal/udpdns.h src/lib/asiolink/udpdns.cc
Showing