Merge branch 'MDL-67095-master' of git://github.com/cescobedo/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 20 Apr 2020 13:26:53 +0000 (21:26 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 23 Apr 2020 07:00:55 +0000 (15:00 +0800)

Trivial merge