Merge branch 'MDL-68930-master' of git://github.com/cescobedo/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 8 Jun 2020 03:47:44 +0000 (11:47 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 8 Jun 2020 03:47:44 +0000 (11:47 +0800)

Trivial merge