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

diff --cc Changelog
index 37b381d9b421fa4f2596837907b27e7d8edc0632,79f00aa15929eb00b782471200c2be98f132148e..351215193a93847db888ad4c06af21932acfaacc
--- 1/Changelog
--- 2/Changelog
+++ b/Changelog
@@@ -2,12 -2,7 +2,13 @@@
        * 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.
  
  1.7.0 2016-12-20
        * Fix lookup of relative names in ldns_resolver_search.