Merge branch 'MDL-66612-master' of git://github.com/crazyserver/moodle

diff --cc lang/en/deprecated.txt
index 861c15a,8898377..f343ba6
--- 1/lang/en/deprecated.txt
--- 2/lang/en/deprecated.txt
+++ b/lang/en/deprecated.txt
@@@ -115,5 -115,7 +115,9 @@@ completeregistration,core_hu
  registersite,core_hub
  updatesite,core_hub
  unregisterexplained,core_hub
- requestcategoryselection,core_admin
 +configrequestcategoryselection,core_admin
++requestcategoryselection,core_admin
+ global,core_calendar
+ globalevent,core_calendar
+ globalevents,core_calendar
+ eventtypeglobal,core_calendar