[trac703] Merge branch 'master' into trac703
... master being updated shortly after the last merge. Conflicts: src/lib/asiodns/io_fetch.cc src/lib/asiodns/io_fetch.h
Showing
... master being updated shortly after the last merge. Conflicts: src/lib/asiodns/io_fetch.cc src/lib/asiodns/io_fetch.h