Merge remote-tracking branch 'origin/dev' into joseph
Added support for GeoIP detection
Added more GeoIP fields