Merge branch 'MDL-70137-master-2' of git://github.com/andrewnicols/moodle
authorVíctor Déniz <victor@moodle.com>
Fri, 6 Nov 2020 19:14:58 +0000 (19:14 +0000)
committerVíctor Déniz <victor@moodle.com>
Fri, 6 Nov 2020 19:15:44 +0000 (19:15 +0000)

Trivial merge