Merge branch 'MDL-57370-master' of git://github.com/ryanwyllie/moodle

diff --cc version.php
index b806b7e,35b002a..2b04592
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2017020200.01;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2017020200.02;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2017020700.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.