Merge branch 'MDL-41612_b' of git://github.com/rwijaya/moodle

diff --cc mod/scorm/player.php
index 4fa5808,2415263..6a5b84f
--- 1/mod/scorm/player.php
--- 2/mod/scorm/player.php
+++ b/mod/scorm/player.php
@@@ -174,7 -197,9 +174,8 @@@ $PAGE->requires->data_for_js('scormplay
  $PAGE->requires->js('/mod/scorm/request.js', true);
  $PAGE->requires->js('/lib/cookies.js', true);
  echo $OUTPUT->header();
+ echo $OUTPUT->heading(format_string($scorm->name));
  
 -// NEW IMS TOC
  $PAGE->requires->string_for_js('navigation', 'scorm');
  $PAGE->requires->string_for_js('toc', 'scorm');
  $PAGE->requires->string_for_js('hide', 'moodle');

diff --cc mod/scorm/report/graphs/report.php
Simple merge

diff --cc mod/scorm/view.php
Simple merge