Merge branch 'MDL-69625' of https://github.com/paulholden/moodle
authorVíctor Déniz <victor@moodle.com>
Mon, 5 Oct 2020 18:22:03 +0000 (19:22 +0100)
committerVíctor Déniz <victor@moodle.com>
Mon, 5 Oct 2020 18:22:03 +0000 (19:22 +0100)

Trivial merge