Merge branch 'MDL-70580-310' of git://github.com/paulholden/moodle into MOODLE_310_STABLE
authorJun Pataleta <jun@moodle.com>
Wed, 13 Jan 2021 02:19:51 +0000 (10:19 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 13 Jan 2021 02:19:51 +0000 (10:19 +0800)

Trivial merge