Merge branch 'MDL-67657-master' of git://github.com/andrewnicols/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Tue, 21 Jul 2020 06:47:14 +0000 (14:47 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Tue, 21 Jul 2020 06:47:14 +0000 (14:47 +0800)

Trivial merge