Errors detected by Topy (https://github.com/intgr/topy), all changes verified by hand. Backport of 11d453bcadad3c9a5ae35882792d0f1e8e8e7818 from master
GeoIP
django.contrib.gis.geoip