Merge branch 'MDL-70995' of https://github.com/paulholden/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 3 Mar 2021 07:05:36 +0000 (15:05 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 3 Mar 2021 07:05:36 +0000 (15:05 +0800)

Trivial merge