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

diff --cc lib/moodlelib.php
Simple merge

diff --cc version.php
index d0a4304,748d11a..5c6af2e
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2018040500.01;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2018040900.00;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2018040500.02;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.