Merge branch 'MDL-55548_master' of git://github.com/markn86/moodle

diff --cc lib/db/upgrade.php
index b130390,d8a5060..91b611e
--- 1/lib/db/upgrade.php
--- 2/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@@ -2865,5 -2865,17 +2865,17 @@@ function xmldb_main_upgrade($oldversion
      // Automatically generated Moodle v3.3.0 release upgrade line.
      // Put any upgrade step following this.
  
 -    if ($oldversion < 2017061200.00) {
++    if ($oldversion < 2017061201.00) {
+         $table = new xmldb_table('course_sections');
+         $field = new xmldb_field('timemodified', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, null, '0', 'availability');
+ 
+         // Define a field 'timemodified' in the 'course_sections' table, to background deletion tasks.
+         if (!$dbman->field_exists($table, $field)) {
+             $dbman->add_field($table, $field);
+         }
+ 
 -        upgrade_main_savepoint(true, 2017061200.00);
++        upgrade_main_savepoint(true, 2017061201.00);
+     }
+ 
      return true;
  }

diff --cc version.php
index 597192c,9075dac..6247e8a
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2017060800.01;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2017061200.00;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2017061201.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.