Merge branch 'MDL-69371-master-fix' of git://github.com/abgreeve/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 22 Oct 2021 04:59:38 +0000 (12:59 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 22 Oct 2021 04:59:38 +0000 (12:59 +0800)

Trivial merge