Merge branch 'MDL-28424' of git://github.com/timhunt/moodle.git with changes

diff --cc mod/quiz/accessrules.php
index 107eae6,ec0d820..d31729b
--- 1/mod/quiz/accessrules.php
--- 2/mod/quiz/accessrules.php
+++ b/mod/quiz/accessrules.php
@@@ -830,7 -829,7 +829,7 @@@ class securewindow_access_rule extends 
       *                $headtags has been deprectaed since Moodle 2.0
       */
      public function setup_secure_page($title, $headtags=null) {
--        global $OUTPUT, $PAGE;
++        global $PAGE;
          $PAGE->set_popup_notification_allowed(false);//prevent message notifications
          $PAGE->set_title($title);
          $PAGE->set_cacheable(false);