Merge remote-tracking branch 'stevee/next-cgi-geoip' into next