Merge branch 'MDL-68597' of https://github.com/timhunt/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 14 Jan 2021 00:35:02 +0000 (08:35 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 14 Jan 2021 00:35:02 +0000 (08:35 +0800)

Trivial merge