Merge branch 'wip-MDL-55126-master' of git://github.com/abgreeve/moodle

Conflicts:
	lib/upgrade.txt

diff --cc lib/upgrade.txt
index 31babe8,b7a92f4..7d4d898
--- 1/lib/upgrade.txt
--- 2/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@@ -14,10 -13,9 +14,13 @@@ information provided here is intended e
    - get_user_max_upload_file_size()
  * The following functions have been removed and should not be used any more:
      - file_modify_html_header() - See MDL-29738 for more information.
 +* core_grades_external::get_grades has been deprecated. Please do not call this function any more.
 +  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.
  
  === 3.1 ===