Merge branch 'wip-MDL-46547-master' of git://github.com/abgreeve/moodle

diff --cc grade/lib.php
index 643bdb9,fa33044..c992ace
--- 1/grade/lib.php
--- 2/grade/lib.php
+++ b/grade/lib.php
@@@ -811,11 -780,10 +813,12 @@@ function print_grade_page_head($coursei
          $buttons = $OUTPUT->render($buttons);
      }
      $PAGE->set_button($buttons);
 -    grade_extend_settings($plugin_info, $courseid);
 +    if ($courseid != SITEID) {
 +        grade_extend_settings($plugin_info, $courseid);
 +    }
  
      $returnval = $OUTPUT->header();
+ 
      if (!$return) {
          echo $returnval;
      }
@@@ -831,14 -798,21 +834,22 @@@
              $returnval .= print_grade_plugin_selector($plugin_info, $active_type, $active_plugin, $return);
          }
  
+         $output = '';
+         // Add a help dialogue box if provided.
+         if (isset($headerhelpidentifier)) {
+             $output = $OUTPUT->heading_with_help($heading, $headerhelpidentifier, $headerhelpcomponent);
+         } else {
+             $output = $OUTPUT->heading($heading);
+         }
+ 
          if ($return) {
-             $returnval .= $OUTPUT->heading($heading);
+             $returnval .= $output;
          } else {
-             echo $OUTPUT->heading($heading);
+             echo $output;
          }
  
 -        if ($CFG->grade_navmethod == GRADE_NAVMETHOD_COMBO || $CFG->grade_navmethod == GRADE_NAVMETHOD_TABS) {
 +        if ($courseid != SITEID &&
 +                ($CFG->grade_navmethod == GRADE_NAVMETHOD_COMBO || $CFG->grade_navmethod == GRADE_NAVMETHOD_TABS)) {
              $returnval .= grade_print_tabs($active_type, $active_plugin, $plugin_info, $return);
          }
      }

diff --cc lang/en/grades.php
Simple merge

diff --cc lib/classes/plugin_manager.php
Simple merge

diff --cc phpunit.xml.dist
Simple merge