Merge GeoIP module changes from maxmind's git, update geo database