Merge branch 'MDL-68746-master-fix' of git://github.com/sarjona/moodle
authorVíctor Déniz Falcón <victor@moodle.com>
Thu, 28 May 2020 10:46:39 +0000 (11:46 +0100)
committerVíctor Déniz Falcón <victor@moodle.com>
Thu, 28 May 2020 10:46:39 +0000 (11:46 +0100)

Trivial merge