Merge branch 'MDL-70476_310' of https://github.com/timhunt/moodle into MOODLE_310_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jan 2021 23:28:08 +0000 (00:28 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jan 2021 23:28:08 +0000 (00:28 +0100)

Trivial merge