Merge branch 'MDL-49501-master' of git://github.com/jleyva/moodle

Conflicts:
	lib/db/services.php
	version.php

lib/db/services.php

@@ -837,6 +837,15 @@ $functions = array(
         'capabilities'  => '',
     ),
 
+    'core_message_mark_message_read' => array(
+        'classname'     => 'core_message_external',
+        'methodname'    => 'mark_message_read',
+        'classpath'     => 'message/externallib.php',
+        'description'   => 'Mark a single message as read, trigger message_viewed event.',
+        'type'          => 'write',
+        'capabilities'  => '',
+    ),
+
     // === notes related functions ===
 
     'moodle_notes_create_notes' => array(
@@ -1085,6 +1094,7 @@ $services = array(
             'core_notes_get_course_notes',
             'core_completion_get_course_completion_status',
             'core_user_view_user_list',
+            'core_message_mark_message_read',
             ),
         'enabled' => 0,
         'restrictedusers' => 0,