Merge branch 'MDL-68904-master' of git://github.com/sarjona/moodle
authorVíctor Déniz Falcón <victor@moodle.com>
Wed, 3 Jun 2020 15:59:43 +0000 (16:59 +0100)
committerVíctor Déniz Falcón <victor@moodle.com>
Wed, 3 Jun 2020 15:59:43 +0000 (16:59 +0100)

Trivial merge