Merge branch 'MDL-51758-master' of git://github.com/andrewnicols/moodle

Conflicts:
	lib/upgrade.txt

diff --cc lib/upgrade.txt
index 91d8d51,194606e..7a542f6
--- 1/lib/upgrade.txt
--- 2/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@@ -20,9 -18,7 +20,10 @@@ information provided here is intended e
    External function gradereport_user_external::get_grades_table can be used for retrieving the course grades table.
    Please note that the information returned from that WS is intended for displaying (not for data consumption).
  * New option 'escape' added to format_string. When true (default), escapes HTML entities from the string
 +* The following functions have been deprecated and are not used any more:
 +  - get_records_csv() Please use csv_import_reader::load_csv_content() instead.
 +  - put_records_csv() Please use download_as_dataformat (lib/dataformatlib.php) instead.
+ * The password_compat library was removed as it is no longer required.
  
  === 3.1 ===