Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

changes/bug2574

@@ -1,2 +1,3 @@
   o Minor features:
-    - Allow nameserves with IPv6 address. Fixes bug 2574.
+    - Allow nameservers with IPv6 address. Fixes bug 2574.
+