Merge branch 'MDL-58465-master' of git://github.com/ankitagarwal/moodle

diff --cc course/tests/externallib_test.php
index b30e442,72759ac..9d0cb22
--- 1/course/tests/externallib_test.php
--- 2/course/tests/externallib_test.php
+++ b/course/tests/externallib_test.php
@@@ -480,11 -480,10 +480,11 @@@ class core_course_externallib_testcase 
                  $this->assertEquals($courseinfo->category, $course3['categoryid']);
                  $this->assertEquals($courseinfo->format, $course3['format']);
                  $this->assertEquals($courseinfo->hiddensections, $course3options['hiddensections']);
 -                $this->assertEquals($courseinfo->numsections, $course3options['numsections']);
 +                $this->assertEquals(course_get_format($createdcourse['id'])->get_last_section_number(),
 +                    $course3options['numsections']);
                  $this->assertEquals($courseinfo->coursedisplay, $course3options['coursedisplay']);
              } else {
-                 throw moodle_exception('Unexpected shortname');
+                 throw new moodle_exception('Unexpected shortname');
              }
          }