Merge branch 'maint-0.2.5' into maint-0.2.8

changes/geoip-october2017

@@ -1,4 +1,4 @@
-  o Minor features:
+  o Minor features (geoip):
     - Update geoip and geoip6 to the October 4 2017 Maxmind GeoLite2
       Country database.