Merge branch 'MDL-70276_310' of https://github.com/stronk7/moodle into MOODLE_310_STABLE
authorSara Arjona <sara@moodle.com>
Thu, 26 Nov 2020 14:04:30 +0000 (15:04 +0100)
committerSara Arjona <sara@moodle.com>
Thu, 26 Nov 2020 14:04:30 +0000 (15:04 +0100)

Trivial merge