Merge branch 'MDL-70373_310' of https://github.com/timhunt/moodle into MOODLE_310_STABLE
authorSara Arjona <sara@moodle.com>
Wed, 16 Dec 2020 11:40:52 +0000 (12:40 +0100)
committerSara Arjona <sara@moodle.com>
Wed, 16 Dec 2020 11:40:52 +0000 (12:40 +0100)

Trivial merge