Merge branch 'MDL-69798' of https://github.com/timhunt/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 8 Oct 2020 05:35:41 +0000 (13:35 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 8 Oct 2020 05:35:41 +0000 (13:35 +0800)

Trivial merge