Merge branch 'MDL-69962-master' of https://github.com/clransom/moodle
authorVíctor Déniz <victor@moodle.com>
Tue, 20 Oct 2020 00:28:31 +0000 (01:28 +0100)
committerVíctor Déniz <victor@moodle.com>
Tue, 20 Oct 2020 00:28:31 +0000 (01:28 +0100)

Trivial merge