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

changes/geoip-july2014

@@ -0,0 +1,3 @@
+  o Minor features:
+    - Update geoip to the July 10 2014 Maxmind GeoLite2 Country database.
+

changes/geoip6-july2014

@@ -0,0 +1,2 @@
+  o Minor features:
+    - Update geoip6 to the July 10 2014 Maxmind GeoLite2 Country database.