Merge branch 'MDL-68338' of git://github.com/timhunt/moodle
authorVictor Deniz Falcon <victor@moodle.com>
Tue, 5 May 2020 21:21:36 +0000 (22:21 +0100)
committerVictor Deniz Falcon <victor@moodle.com>
Tue, 5 May 2020 21:21:36 +0000 (22:21 +0100)

Trivial merge