Merge branch 'MDL-69825' of https://github.com/paulholden/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 12 Oct 2020 00:08:15 +0000 (08:08 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 12 Oct 2020 00:08:15 +0000 (08:08 +0800)

Trivial merge