Merge branch 'MDL-51267-master' of git://github.com/lameze/moodle

diff --cc mod/upgrade.txt
index ad0c75d,ecf5a47..73338ec
--- 1/mod/upgrade.txt
--- 2/mod/upgrade.txt
+++ b/mod/upgrade.txt
@@@ -3,10 -3,10 +3,12 @@@ information provided here is intended e
  
  === 3.1 ===
  
+ * A new parameter ($attributes) has been added to standard_intro_elements() on course/moodleform_mod.php. The
+   purpose of this parameter is allow developers to pass an array with custom attributes to the text editor.
  * Old /mod/MODULENAME/pix/icon.gif and enrol/paypal/pix/icon.gif GIF icons have been removed. Please use pix_icon
    renderable instead.
 +* Callback get_types() is deprecated, instead activity modules can define callback get_shortcuts().
 +  See source code for get_module_metadata().
  
  === 3.0 ===