Merge branch 'MDL-70261-310' of git://github.com/ilya-catalyst/moodle into MOODLE_310...
authorVíctor Déniz <victor@moodle.com>
Wed, 16 Dec 2020 12:34:29 +0000 (12:34 +0000)
committerVíctor Déniz <victor@moodle.com>
Wed, 16 Dec 2020 12:34:29 +0000 (12:34 +0000)

Trivial merge