Merge branch 'MDL-68861-master' of git://github.com/vmdef/moodle
authorVictor Deniz Falcon <victor@moodle.com>
Mon, 1 Jun 2020 07:11:48 +0000 (08:11 +0100)
committerVictor Deniz Falcon <victor@moodle.com>
Mon, 1 Jun 2020 07:11:48 +0000 (08:11 +0100)

Trivial merge