Merge branch 'MDL-71694-master' of https://github.com/lucisgit/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 24 Jun 2021 04:00:09 +0000 (12:00 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 24 Jun 2021 04:00:09 +0000 (12:00 +0800)

Trivial merge