Merge branch 'MDL-67813-master-1' of git://github.com/mihailges/moodle
authorVíctor Déniz Falcón <victor@moodle.com>
Thu, 28 May 2020 12:00:16 +0000 (13:00 +0100)
committerVíctor Déniz Falcón <victor@moodle.com>
Thu, 28 May 2020 12:00:16 +0000 (13:00 +0100)

Trivial merge