Merge branch 'MDL-71116-master' of git://github.com/sarjona/moodle
authorVíctor Déniz <victor@moodle.com>
Thu, 8 Apr 2021 00:01:15 +0000 (01:01 +0100)
committerVíctor Déniz <victor@moodle.com>
Thu, 8 Apr 2021 00:01:15 +0000 (01:01 +0100)

Trivial merge