Merge branch 'master' into rt42931

diff --cc CHANGES
index 88775a39b93e68d9a86cdcc4f02c822cacccdd44,bde665b3c3d655ed7aa1cd853f129cd2d3fd7579..2b1096ed2cf6d489f82ef0d046e8d2ff6699ede2
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -1,8 -1,25 +1,28 @@@
+ 4467. [security]      It was possible to trigger a assertion when rendering
+                       a message. (CVE-2016-2776) [RT #43139]
+ 
+ 4466. [bug]           Interface scanning didn't work on a Windows system
+                       without a non local IPv6 addresses. [RT #43130]
+ 
+ 4465. [bug]           Don't use "%z" as Windows doesn't support it.
+                       [RT #43131]
+ 
+ 4464. [bug]           Fix windows python support. [RT #43173]
+ 
+ 4463. [bug]           The dnstap system test failed on some systems.
+                       [RT #43129]
+ 
+ 4462. [bug]           Don't describe a returned EDNS COOKIE as "good"
+                       when there isn't a valid server cookie. [RT #43167]
+ 
+ 4461. [bug]           win32: not all external data was properly marked
+                       as external data for windows dll. [RT #43161]
+ 
        --- 9.11.0rc1 released ---
  
 +4461. [bug]           win32: not all external data was properly marked
 +                      as external data for windows dll. [RT #43161]
 +
  4460. [test]          Add system test for dnstap using unix domain sockets.
                        [RT #42926]