Merge branch 'MDL-71170_master' of git://github.com/mdjnelson/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 22 Apr 2021 10:55:28 +0000 (18:55 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 22 Apr 2021 10:55:28 +0000 (18:55 +0800)

Trivial merge