Merge branch 'MDL-67668-master-2' of git://github.com/andrewnicols/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 23 Nov 2020 07:40:04 +0000 (15:40 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 23 Nov 2020 07:40:04 +0000 (15:40 +0800)

Trivial merge