Merge branch 'MDL-69549-master-7' of git://github.com/andrewnicols/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 15 Oct 2020 07:10:05 +0000 (15:10 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 15 Oct 2020 07:10:05 +0000 (15:10 +0800)

Trivial merge