Merge branch 'MDL-71205' of https://github.com/mkassaei/moodle
authorabgreeve <adrian@moodle.com>
Wed, 21 Apr 2021 05:32:14 +0000 (13:32 +0800)
committerabgreeve <adrian@moodle.com>
Wed, 21 Apr 2021 05:32:14 +0000 (13:32 +0800)

Trivial merge