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

Trivial merge