Merge branch 'MDL-70167-master' of git://github.com/andrewnicols/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 3 Dec 2020 02:09:47 +0000 (10:09 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 3 Dec 2020 02:09:47 +0000 (10:09 +0800)

Trivial merge