Merge branch 'MDL-71634-master' of git://github.com/lucaboesch/moodle
authorVíctor Déniz <victor@moodle.com>
Tue, 22 Jun 2021 17:27:38 +0000 (18:27 +0100)
committerVíctor Déniz <victor@moodle.com>
Tue, 22 Jun 2021 17:27:38 +0000 (18:27 +0100)

Trivial merge