Merge branch 'MDL-68498-master' of git://github.com/mihailges/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 14 May 2020 06:13:55 +0000 (14:13 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 14 May 2020 06:13:55 +0000 (14:13 +0800)

Trivial merge