[master] Merge branch 'master' of ssh://git.kea.isc.org/git/kea

Conflicts:
	ChangeLog

diff --cc ChangeLog
index f02556effd74e20c192305fd54277eb98035051d,279d7705970d5653b3e0ad5966e02d77a8b9e629..31369822500ff718b89cefa1fe4a42f147d478cf
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,11 +1,16 @@@
- 832.  [bug]           jiri
++833.  [bug]           jiri
 +      Compilation fix for PostgreSQL on i686. Thanks to Jiri Popelka
 +      from RedHat for providing a patch!
 +      (Trac #3532, git 96a06654f2177444dcea3a0e9f6fa06947855497)
 +
+ 832.  [func]          marcin
+       DHCP servers check if the interfaces specified in the configuration,
+       to be used to receive DHCP messsages, are present in the system.
+       If the interface doesn't exist, an error is reported. In addition,
+       the SO_REUSEPORT flag is set for IPv6 sockets as multiple multicast
+       sockets can be bound to the DHCPv6 server port.
+       (Trac #3512, git 5cbbab2d01c6e1bf6d563ba64d80bc6bc857f73d)
+ 
  831.  [bug]           marcin
        Kea deamons report configuration summary when the configuration is
        completed successfully.