Merge branch 'isc-master'

diff --cc AUTHORS
index 3f78036192addc5a35335ffafd1417eaf610236c,1fa201b930836c6ad41ccb2f7e324d0caa276a48..b6c8423307d379cfe8b4bf0e796c86ac3806b4d4
mode 100755,100644..100644
--- 1/AUTHORS
--- 2/AUTHORS
+++ b/AUTHORS
@@@ -100,12 -100,9 +100,15 @@@ We have received the following contribu
   - Razvan Becheriu, Qualitance
     2016-05: Added support for Cassandra
  
-    2016-06: Added support for IPv6 prefix and PDEXCLUDE option
+  - Patrik Lundin
+    2016-08: Replace test by expr for < in configure.ac
+ 
 + - Cristian Secareanu, Qualitance
-    2016-06: [RFCs 6334, 6603, 7598] Additional native option support
++   2016-08: Added support for IPv6 prefix and PDEXCLUDE option
 +
 + - Andrei Pavel, Qualitance
++   2016-08: [RFCs 6334, 6603, 7598] Additional native option support
 +
  Kea uses log4cplus (http://sourceforge.net/projects/log4cplus/) for logging,
  Boost (http://www.boost.org/) library for almost everything, and can use Botan
  (http://botan.randombit.net/) or OpenSSL (https://www.openssl.org/) for

diff --cc src/bin/dhcp4/dhcp4_srv.cc
Simple merge

diff --cc src/bin/dhcp6/dhcp6_srv.cc
Simple merge

diff --cc src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
Simple merge

diff --cc src/lib/dhcp/option6_ia.cc
Simple merge

diff --cc src/lib/dhcp/option6_iaaddr.cc
Simple merge

diff --cc src/lib/dhcp/option6_iaprefix.cc
Simple merge

diff --cc src/lib/dhcp/option_custom.cc
Simple merge

diff --cc src/lib/dhcp/option_int.h
Simple merge

diff --cc src/lib/dhcp/pkt4.cc
Simple merge

diff --cc src/lib/dhcp/pkt6.cc
Simple merge

diff --cc src/lib/dhcp/tests/libdhcp++_unittest.cc
Simple merge