Merge branch 'MDL-68481_master' of git://github.com/mdjnelson/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 16 Dec 2020 07:20:12 +0000 (15:20 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 16 Dec 2020 07:20:12 +0000 (15:20 +0800)

Trivial merge