Merge branch 'MDL-64776-master' of git://github.com/peterRd/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Tue, 24 Nov 2020 00:57:12 +0000 (08:57 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Tue, 24 Nov 2020 00:57:12 +0000 (08:57 +0800)

Trivial merge