Merge branch 'MDL-70102-m310' of https://github.com/sammarshallou/moodle into MOODLE_...
authorSara Arjona <sara@moodle.com>
Fri, 8 Jan 2021 14:51:05 +0000 (15:51 +0100)
committerSara Arjona <sara@moodle.com>
Fri, 8 Jan 2021 14:51:05 +0000 (15:51 +0100)

Trivial merge