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

Trivial merge