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

diff --cc calendar/lib.php
Simple merge

diff --cc lib/db/upgrade.php
index 50599a7,c5815a7..09f65e7
--- 1/lib/db/upgrade.php
--- 2/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@@ -2793,5 -2793,20 +2793,20 @@@ function xmldb_main_upgrade($oldversion
          upgrade_main_savepoint(true, 2017102100.01);
      }
  
 -    if ($oldversion < 2017110200.00) {
++    if ($oldversion < 2017110300.01) {
+ 
+         // Define field categoryid to be added to event_subscriptions.
+         $table = new xmldb_table('event_subscriptions');
+         $field = new xmldb_field('categoryid', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, null, '0', 'url');
+ 
+         // Conditionally launch add field categoryid.
+         if (!$dbman->field_exists($table, $field)) {
+             $dbman->add_field($table, $field);
+         }
+ 
+         // Main savepoint reached.
 -        upgrade_main_savepoint(true, 2017110200.00);
++        upgrade_main_savepoint(true, 2017110300.01);
+     }
+ 
      return true;
  }

diff --cc version.php
index 1a90c1f,4857adb..f5ff82a
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2017110300.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2017110200.00;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2017110300.01;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.