Merge branch 'w42_MDL-29880_m22_geoip' of git://github.com/skodak/moodle