Merge changes to GeoIP module from MaxMind's git