Merge branch 'MDL-68921-master' of git://github.com/vmdef/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Tue, 25 Aug 2020 02:39:28 +0000 (10:39 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Tue, 25 Aug 2020 02:39:28 +0000 (10:39 +0800)

Trivial merge