Merge branch 'MDL-70322-310' of git://github.com/roland04/moodle into MOODLE_310_STABLE
authorSara Arjona <sara@moodle.com>
Wed, 16 Dec 2020 11:04:22 +0000 (12:04 +0100)
committerSara Arjona <sara@moodle.com>
Wed, 16 Dec 2020 11:04:22 +0000 (12:04 +0100)

Trivial merge