Merge branch 'MDL-68749-310-2' of git://github.com/mickhawkins/moodle into MOODLE_310...
authorVíctor Déniz <victor@moodle.com>
Wed, 4 Nov 2020 15:24:08 +0000 (15:24 +0000)
committerVíctor Déniz <victor@moodle.com>
Wed, 4 Nov 2020 15:24:08 +0000 (15:24 +0000)

Trivial merge