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

Trivial merge