Merge branch 'MDL-69807' of https://github.com/paulholden/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 21 Oct 2020 06:13:07 +0000 (14:13 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 21 Oct 2020 06:13:07 +0000 (14:13 +0800)

Trivial merge