Merge branch 'MDL-67070-master' of git://github.com/andrewnicols/moodle

diff --cc admin/tool/usertours/db/upgrade.php
index db3ccd8,5844e49..dce812b
--- 1/admin/tool/usertours/db/upgrade.php
--- 2/admin/tool/usertours/db/upgrade.php
+++ b/admin/tool/usertours/db/upgrade.php
@@@ -61,11 -47,11 +47,11 @@@ function xmldb_tool_usertours_upgrade($
      // Automatically generated Moodle v3.8.0 release upgrade line.
      // Put any upgrade step following this.
  
-     if ($oldversion < 2020031900) {
 -    if ($oldversion < 2020061100) {
++    if ($oldversion < 2020061501) {
          // Updating shipped tours will fix broken sortorder records in existing tours.
          manager::update_shipped_tours();
  
-         upgrade_plugin_savepoint(true, 2020031900, 'tool', 'usertours');
 -        upgrade_plugin_savepoint(true, 2020061100, 'tool', 'usertours');
++        upgrade_plugin_savepoint(true, 2020061501, 'tool', 'usertours');
      }
  
      return true;

diff --cc admin/tool/usertours/version.php
index deb33db,a3c7919..c477167
--- 1/admin/tool/usertours/version.php
--- 2/admin/tool/usertours/version.php
+++ b/admin/tool/usertours/version.php
@@@ -24,6 -24,6 +24,6 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $plugin->version   = 2020061500;            // The current module version (Date: YYYYMMDDXX).
 -$plugin->version   = 2020061100;            // The current module version (Date: YYYYMMDDXX).
 -$plugin->requires  = 2019111200;            // Requires this Moodle version.
++$plugin->version   = 2020061501;            // The current module version (Date: YYYYMMDDXX).
 +$plugin->requires  = 2020060900;            // Requires this Moodle version.
  $plugin->component = 'tool_usertours';      // Full name of the plugin (used for diagnostics).