Merge remote-tracking branch 'old-gitlab/develop' into develop

diff --cc Changelog
index 351215193a93847db888ad4c06af21932acfaacc,fcf37cffdcec689cb7582f942e39ac5bdfda4844..dbe45c3006d63d173427427266e816ef6dc59ba8
--- 1/Changelog
--- 2/Changelog
+++ b/Changelog
@@@ -2,13 -2,10 +2,16 @@@
        * ldns-notify can use all supported hash algorithms with -y.
        * bugfix #1209: make install ldns.pc file
          Thanks Oleksandr Natalenko
 +      * bugfix #1218: Only chase DS if signer is parent of owner.
 +        Thanks Emil Natan
 +      * bugfix #617: Retry WKS service and protocol names lower case.
 +        Thanks Siali Yan
 +      * Spelling errors in binaries and man pages
 +        Thanks Andreas Schulze
        * removed duplicate condition in ldns_udp_send_query.
+       * ldns_wire2pkt: fix null pointer dereference if pkt allocation fails
+         and fix memory leak with more EDNS sections
+         Thanks Jan Vcelak
  
  1.7.0 2016-12-20
        * Fix lookup of relative names in ldns_resolver_search.