Merge branch 'MDL-70312' of git://github.com/paulholden/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 14 Jan 2021 03:54:37 +0000 (11:54 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 14 Jan 2021 03:54:37 +0000 (11:54 +0800)

Trivial merge