Merge branch 'MDL-32873-master-1' of git://git.luns.net.uk/moodle

Conflicts:
	course/lib.php

diff --cc course/lib.php
index 7fb8405,88de106..6579cf3
--- 1/course/lib.php
--- 2/course/lib.php
+++ b/course/lib.php
@@@ -4516,8 -4548,7 +4548,9 @@@ function include_course_ajax($course, $
          $PAGE->requires->string_for_js('pluginname', $module);
      }
  
 +    // Prevent caching of this page to stop confusion when changing page after making AJAX changes
 +    $PAGE->set_cacheable(false);
+     return true;
  }
  
  /**