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

Conflicts:
	lib/db/services.php

diff --cc mod/quiz/db/services.php
index bdd52c7,f7977b3..9fd4d75
--- 1/mod/quiz/db/services.php
--- 2/mod/quiz/db/services.php
+++ b/mod/quiz/db/services.php
@@@ -61,7 -58,14 +61,15 @@@ $functions = array
          'methodname'    => 'get_user_best_grade',
          'description'   => 'Get the best current grade for the given user on a quiz.',
          'type'          => 'read',
 -        'capabilities'  => 'mod/quiz:view'
 +        'capabilities'  => 'mod/quiz:view',
 +        'services'      => array(MOODLE_OFFICIAL_MOBILE_SERVICE)
      ),
+ 
+     'mod_quiz_get_combined_review_options' => array(
+         'classname'     => 'mod_quiz_external',
+         'methodname'    => 'get_combined_review_options',
+         'description'   => 'Combines the review options from a number of different quiz attempts.',
+         'type'          => 'read',
+         'capabilities'  => 'mod/quiz:view'
+     ),
  );