Merge branch 'MDL-69644' of https://github.com/paulholden/moodle
authorVíctor Déniz <victor@moodle.com>
Mon, 28 Sep 2020 19:33:35 +0000 (20:33 +0100)
committerVíctor Déniz <victor@moodle.com>
Mon, 28 Sep 2020 19:33:35 +0000 (20:33 +0100)

Trivial merge