Merge branch 'MDL-67593-master' of https://github.com/snake/moodle

diff --cc lang/en/admin.php
Simple merge

diff --cc lib/maxmind/readme_moodle.txt
index 50e1c11,dd8e594..ad9b903
--- 1/lib/maxmind/readme_moodle.txt
--- 2/lib/maxmind/readme_moodle.txt
+++ b/lib/maxmind/readme_moodle.txt
@@@ -16,15 -16,15 +16,15 @@@ Installatio
  ------------
  
  1) Download the latest versions of GeoIP2-php and MaxMind-DB-Reader-php
 -wget https://github.com/maxmind/GeoIP2-php/archive/v2.9.0.zip
 -wget https://github.com/maxmind/MaxMind-DB-Reader-php/archive/v1.4.1.zip
 +wget https://github.com/maxmind/GeoIP2-php/archive/v2.10.0.zip
 +wget https://github.com/maxmind/MaxMind-DB-Reader-php/archive/v1.5.1.zip
  
  2) Unzip the archives
 -unzip v2.9.0.zip
 -unzip v1.4.1.zip
 +unzip v2.10.0.zip
 +unzip v1.5.1.zip
  
  3) Move the source code directories into place
 -mv GeoIP2-php-2.9.0/src/ /path/to/moodle/lib/maxmind/GeoIp2/
 -mv MaxMind-DB-Reader-php-1.4.1/src/MaxMind/ /path/to/moodle/lib/maxmind/MaxMind/
 +mv GeoIP2-php-2.10.0/src/ /path/to/moodle/lib/maxmind/GeoIp2/
 +mv MaxMind-DB-Reader-php-1.5.1/src/MaxMind/ /path/to/moodle/lib/maxmind/MaxMind/
  
- 4) Run unit tests on iplookup/tests/geoip_test.php with PHPUNIT_LONGTEST defined.
+ 4) Run unit tests on iplookup/tests/geoip_test.php.