Merge branch 'MDL-68984-master' of git://github.com/mickhawkins/moodle
authorVíctor Déniz Falcón <victor@moodle.com>
Tue, 9 Jun 2020 12:45:40 +0000 (13:45 +0100)
committerVíctor Déniz Falcón <victor@moodle.com>
Tue, 9 Jun 2020 12:45:40 +0000 (13:45 +0100)

Trivial merge