Merge branch 'MDL-69825-310' of https://github.com/paulholden/moodle into MOODLE_310_...
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 12 Oct 2020 00:09:47 +0000 (08:09 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 12 Oct 2020 00:09:47 +0000 (08:09 +0800)

Trivial merge