Merge remote-tracking branch 'origin/maint-0.2.5'

changes/geoip-january2015

@@ -0,0 +1,3 @@
+  o Minor features:
+    - Update geoip to the January 7 2015 Maxmind GeoLite2 Country database.
+

changes/geoip6-january2015

@@ -0,0 +1,2 @@
+  o Minor features:
+    - Update geoip6 to the January 7 2015 Maxmind GeoLite2 Country database.