Merge branch 'MDL-69043' of https://github.com/stronk7/moodle
authorVíctor Déniz Falcón <victor@moodle.com>
Mon, 15 Jun 2020 14:55:22 +0000 (15:55 +0100)
committerVíctor Déniz Falcón <victor@moodle.com>
Mon, 15 Jun 2020 14:55:22 +0000 (15:55 +0100)

Trivial merge