Merge branch 'MDL-54907' of https://github.com/timhunt/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 16 Dec 2020 02:34:58 +0000 (10:34 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 16 Dec 2020 02:34:58 +0000 (10:34 +0800)

Trivial merge