Merge branch 'MDL-61714-master' of git://github.com/sarjona/moodle

diff --cc lib/db/upgrade.php
index edafff2,ad633f7..5e8fcd3
--- 1/lib/db/upgrade.php
--- 2/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@@ -2216,5 -2216,20 +2216,20 @@@ function xmldb_main_upgrade($oldversion
          upgrade_main_savepoint(true, 2018040500.01);
      }
  
 -    if ($oldversion < 2018050800.02) {
++    if ($oldversion < 2018050900.01) {
+         // Update default digital age consent map according to the current legislation on each country.
+         $ageofdigitalconsentmap = implode(PHP_EOL, [
+             '*, 16',
+             'AT, 14',
+             'ES, 14',
+             'SI, 14',
+             'US, 13'
+         ]);
+         set_config('agedigitalconsentmap', $ageofdigitalconsentmap);
+ 
+         // Main savepoint reached.
 -        upgrade_main_savepoint(true, 2018050800.02);
++        upgrade_main_savepoint(true, 2018050900.01);
+     }
+ 
      return true;
  }

diff --cc version.php
index 60bcd64,8288017..e5e796f
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2018050900.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2018050800.02;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2018050900.01;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.