Merge branch 'MDL-68831' of https://github.com/timhunt/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 16 Dec 2020 16:04:33 +0000 (00:04 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 16 Dec 2020 16:04:33 +0000 (00:04 +0800)

Trivial merge