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

diff --cc lib/db/services.php
Simple merge

diff --cc message/classes/api.php
Simple merge

diff --cc message/externallib.php
Simple merge

diff --cc message/tests/api_test.php
Simple merge

diff --cc message/tests/externallib_test.php
Simple merge

diff --cc message/upgrade.txt
Simple merge

diff --cc version.php
index af76cef,82f0af3..0e89d0a
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2018102200.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2018101900.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2018102300.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.