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

Trivial merge