Merge branch 'MDL-69419-310' of git://github.com/andrewnicols/moodle into MOODLE_310_...
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 27 Aug 2020 00:08:07 +0000 (08:08 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 27 Aug 2020 00:08:07 +0000 (08:08 +0800)

Trivial merge