Merge branch 'MDL-69308_310' of https://github.com/stronk7/moodle into MOODLE_310_STABLE
authorSara Arjona <sara@moodle.com>
Thu, 14 Jan 2021 11:03:52 +0000 (12:03 +0100)
committerSara Arjona <sara@moodle.com>
Thu, 14 Jan 2021 11:03:52 +0000 (12:03 +0100)

Trivial merge