Merge branch 'MDL-68227-master' of git://github.com/sarjona/moodle
authorVíctor Déniz Falcón <victor@moodle.com>
Wed, 13 May 2020 16:13:11 +0000 (17:13 +0100)
committerVíctor Déniz Falcón <victor@moodle.com>
Wed, 13 May 2020 16:13:11 +0000 (17:13 +0100)

Trivial merge