Merge branch 'master' into trac2369

diff --cc src/lib/dns/Makefile.am
index 17d62964f349fcfd3a8856ce9d1eba82b52f9f07,5cf07321c075f87764a685bb1ce630693e825d7a..e81ef76a8de36b463dc3bb6e6b3cfeb4107aa6b3
--- 1/src/lib/dns/Makefile.am
--- 2/src/lib/dns/Makefile.am
+++ b/src/lib/dns/Makefile.am
@@@ -93,9 -93,9 +93,10 @@@ libb10_dns___la_LDFLAGS = -no-undefine
  libb10_dns___la_SOURCES =
  libb10_dns___la_SOURCES += edns.h edns.cc
  libb10_dns___la_SOURCES += exceptions.h exceptions.cc
 +libb10_dns___la_SOURCES += master_lexer_inputsource.h master_lexer_inputsource.cc
  libb10_dns___la_SOURCES += labelsequence.h labelsequence.cc
  libb10_dns___la_SOURCES += masterload.h masterload.cc
+ libb10_dns___la_SOURCES += master_lexer.h master_lexer.cc
  libb10_dns___la_SOURCES += message.h message.cc
  libb10_dns___la_SOURCES += messagerenderer.h messagerenderer.cc
  libb10_dns___la_SOURCES += name.h name.cc

diff --cc src/lib/dns/tests/Makefile.am
index 2f514964703ffb284332abbffd78533e1842274e,6df0e624d403329364dfb63610fc54c84e1563dd..35d659c83a9048e618aabf7c0b43bbb6233512ae
--- 1/src/lib/dns/tests/Makefile.am
--- 2/src/lib/dns/tests/Makefile.am
+++ b/src/lib/dns/tests/Makefile.am
@@@ -22,9 -22,9 +22,10 @@@ if HAVE_GTES
  TESTS += run_unittests
  run_unittests_SOURCES = unittest_util.h unittest_util.cc
  run_unittests_SOURCES += edns_unittest.cc
 +run_unittests_SOURCES += master_lexer_inputsource_unittest.cc
  run_unittests_SOURCES += labelsequence_unittest.cc
  run_unittests_SOURCES += messagerenderer_unittest.cc
+ run_unittests_SOURCES += master_lexer_token_unittest.cc
  run_unittests_SOURCES += name_unittest.cc
  run_unittests_SOURCES += nsec3hash_unittest.cc
  run_unittests_SOURCES += rrclass_unittest.cc rrtype_unittest.cc