Merge branch 'MDL-70558-310' of git://github.com/paulholden/moodle into MOODLE_310_STABLE
authorSara Arjona <sara@moodle.com>
Fri, 8 Jan 2021 16:07:23 +0000 (17:07 +0100)
committerSara Arjona <sara@moodle.com>
Fri, 8 Jan 2021 16:07:23 +0000 (17:07 +0100)

Trivial merge