Merge branch 'MDL-41726-master-2nd' of git://github.com/FMCorz/moodle

Conflicts:
	lang/en/moodle.php

diff --cc lang/en/moodle.php
index 5ea320f,e0f1cdc..b41fd32
--- 1/lang/en/moodle.php
--- 2/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@@ -665,9 -665,8 +665,11 @@@ $string['eventcoursecategorydeleted'] 
  $string['eventcoursecontentdeleted'] = 'Course content deleted';
  $string['eventcoursecreated'] = 'Course created';
  $string['eventcoursedeleted'] = 'Course deleted';
 +$string['eventcoursemodulecreated'] = 'Course module created';
 +$string['eventcoursemoduledeleted'] = 'Course module deleted';
 +$string['eventcoursemoduleupdated'] = 'Course module updated';
+ $string['eventcourseresetended'] = 'Course reset ended';
+ $string['eventcourseresetstarted'] = 'Course reset started';
  $string['eventcourserestored'] = 'Course restored';
  $string['eventcourseupdated'] = 'Course updated';
  $string['eventcoursesectionupdated'] = ' Course section updated';

diff --cc lib/moodlelib.php
Simple merge

diff --cc mod/quiz/locallib.php
Simple merge