Merge branch 'MDL-63683-310' of https://github.com/dravek/moodle into MOODLE_310_STABLE
authorVíctor Déniz <victor@moodle.com>
Wed, 9 Dec 2020 12:47:52 +0000 (12:47 +0000)
committerVíctor Déniz <victor@moodle.com>
Wed, 9 Dec 2020 12:47:52 +0000 (12:47 +0000)

Trivial merge