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

diff --cc course/externallib.php
Simple merge

diff --cc course/tests/externallib_test.php
Simple merge

diff --cc course/upgrade.txt
index f23582e,e2c92cc..efa1b2f
--- 1/course/upgrade.txt
--- 2/course/upgrade.txt
+++ b/course/upgrade.txt
@@@ -2,8 -2,7 +2,10 @@@ This files describes API changes in /co
  information provided here is intended especially for developers.
  
  === 3.7 ===
++
 + * External function core_course_external::get_course_contents new returns the following additional completiondata field:
 +   - valueused (indicates whether the completion state affects the availability of other content)
+  * External function core_course_external::get_course_contents now returns a new contentsinfo field with summary files information.
  
  === 3.6 ===