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

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