Merge branch 'MDL-55048-master' of git://github.com/danpoltawski/moodle

diff --combined lib/upgrade.txt
index 8d59efb,ffcba56..31babe8
--- 1/lib/upgrade.txt
--- 2/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@@ -3,6 -3,7 +3,7 @@@ information provided here is intended e
  
  === 3.2 ===
  
+ * Node.js versions >=4 are now required to run grunt.
  * New option 'blanktarget' added to format_text. This option adds target="_blank" to links
  * A new webservice structure `external_files` has been created which provides a standardised view of files in Moodle and
    should be used for all file return descriptions.
@@@ -13,10 -14,6 +14,10 @@@
    - 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
  
  === 3.1 ===