Merge branch 'MDL-69559-master-7' of git://github.com/mickhawkins/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 26 Oct 2020 05:02:31 +0000 (13:02 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 26 Oct 2020 05:02:31 +0000 (13:02 +0800)

Trivial merge