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

diff --cc lib/db/install.xml
index fcc226d,76e23ee..b077fb3
--- 1/lib/db/install.xml
--- 2/lib/db/install.xml
+++ b/lib/db/install.xml
@@@ -1,5 -1,5 +1,5 @@@
  <?xml version="1.0" encoding="UTF-8" ?>
- <XMLDB PATH="lib/db" VERSION="20150608" COMMENT="XMLDB file for core Moodle tables"
 -<XMLDB PATH="lib/db" VERSION="20150814" COMMENT="XMLDB file for core Moodle tables"
++<XMLDB PATH="lib/db" VERSION="20150824" COMMENT="XMLDB file for core Moodle tables"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:noNamespaceSchemaLocation="../../lib/xmldb/xmldb.xsd"
  >

diff --cc lib/db/upgrade.php
index 0adf125,a3e1885..9dcce10
--- 1/lib/db/upgrade.php
--- 2/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@@ -4441,20 -4441,19 +4441,34 @@@ function xmldb_main_upgrade($oldversion
          upgrade_main_savepoint(true, 2015062500.01);
      }
  
 -    if ($oldversion < 2015081400.00) {
 +    if ($oldversion < 2015081300.01) {
 +
 +        // Define field importtype to be added to grade_import_values.
 +        $table = new xmldb_table('grade_import_values');
 +        $field = new xmldb_field('importonlyfeedback', XMLDB_TYPE_INTEGER, '1', null, null, null, '0', 'importer');
 +
 +        // Conditionally launch add field importtype.
 +        if (!$dbman->field_exists($table, $field)) {
 +            $dbman->add_field($table, $field);
 +        }
 +
 +        // Main savepoint reached.
 +        upgrade_main_savepoint(true, 2015081300.01);
 +    }
 +
++    if ($oldversion < 2015082400.00) {
+ 
+         // Define table webdav_locks to be dropped.
+         $table = new xmldb_table('webdav_locks');
+ 
+         // Conditionally launch drop table for webdav_locks.
+         if ($dbman->table_exists($table)) {
+             $dbman->drop_table($table);
+         }
+ 
+         // Main savepoint reached.
 -        upgrade_main_savepoint(true, 2015081400.00);
++        upgrade_main_savepoint(true, 2015082400.00);
+     }
+ 
      return true;
  }

diff --cc version.php
index 822072b,8e2f314..048e9c2
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2015082000.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2015081400.00;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2015082400.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.