Merge branch 'MDL-62994-master' of git://github.com/mihailges/moodle

diff --cc theme/upgrade.txt
index ed43009,9a98c7c..2062b8b
--- 1/theme/upgrade.txt
--- 2/theme/upgrade.txt
+++ b/theme/upgrade.txt
@@@ -13,11 -13,8 +13,12 @@@ information provided here is intended e
    - Microsoft Edge: The body class should change from safari to edge.
    - Mobile safari: The class ios should exist, safari class should be removed.
  * Remove class .safari styling from activity chooser dialog for theme boost and bootstrapbase.
 -* The following functions have been finally deprecated and can not be used anymore:
 +* The following functions and classes have been finally deprecated and can not be used anymore:
 +  * css_is_colour()
 +  * css_is_width()
 +  * css_sort_by_count()
+   * core_course_renderer::add_modchoosertoggle()
 +  * class css_optimiser
  
  === 3.4 ===