Merge branch 'MDL-58768-master-2' of git://github.com/rezaies/moodle

diff --cc lib/upgrade.txt
index 1e80db1,9cf3386..cc918f4
--- 1/lib/upgrade.txt
--- 2/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@@ -36,13 -22,10 +36,16 @@@ information provided here is intended e
      - I set the field "<field_string>" to multiline
      - I follow "<link_string>"" in the open menu
  * Removed the lib/password_compat/lib/password.php file.
 +* The eventslib.php file has been deleted and its functions have been moved to deprecatedlib.php. The affected functions are:
 +  - events_get_cached()
 +  - events_uninstall()
 +  - events_cleanup()
 +  - events_dequeue()
 +  - events_get_handlers()
  
+ * coursecat::get() now has optional $user parameter.
+ * coursecat::is_uservisible() now has optional $user parameter.
+ 
  === 3.5 ===
  
  * There is a new privacy API that every subsystem and plugin has to implement so that the site can become GDPR

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