Merge branch 'MDL-66755-master' of https://github.com/SergioComeron/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 27 Jul 2020 08:55:34 +0000 (16:55 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 27 Jul 2020 08:55:34 +0000 (16:55 +0800)

Trivial merge