Merge branch 'MDL-69415-master' of git://github.com/sarjona/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 16 Apr 2021 03:25:55 +0000 (11:25 +0800)
committerVíctor Déniz <victor@moodle.com>
Fri, 16 Apr 2021 06:57:01 +0000 (07:57 +0100)

Trivial merge