Merge branch 'MDL-71466-master' of https://github.com/sammarshallou/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 27 May 2021 03:25:59 +0000 (11:25 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 27 May 2021 03:25:59 +0000 (11:25 +0800)

Trivial merge