Merge branch 'MDL-70374_310' of https://github.com/timhunt/moodle into MOODLE_310_STABLE
authorJun Pataleta <jun@moodle.com>
Thu, 7 Jan 2021 04:24:18 +0000 (12:24 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 7 Jan 2021 04:24:18 +0000 (12:24 +0800)

Trivial merge