Merge branch 'MDL-70580-310' of git://github.com/paulholden/moodle into MOODLE_310_STABLE
authorJun Pataleta <jun@moodle.com>
Tue, 12 Jan 2021 05:15:43 +0000 (13:15 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 12 Jan 2021 05:15:43 +0000 (13:15 +0800)

Trivial merge