Merge branch 'MDL-70422-310' of https://github.com/paulholden/moodle into MOODLE_310_...
authorSara Arjona <sara@moodle.com>
Tue, 15 Dec 2020 15:43:02 +0000 (16:43 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 15 Dec 2020 15:43:02 +0000 (16:43 +0100)

Trivial merge