Merge branch 'MDL-54907_310' of https://github.com/timhunt/moodle into MOODLE_310_STABLE
authorJun Pataleta <jun@moodle.com>
Wed, 16 Dec 2020 02:26:58 +0000 (10:26 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 16 Dec 2020 02:26:58 +0000 (10:26 +0800)

Trivial merge