Merge branch 'MDL-69201-310' of https://github.com/paulholden/moodle into MOODLE_310_...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Nov 2020 22:00:18 +0000 (23:00 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Nov 2020 22:00:18 +0000 (23:00 +0100)

Trivial merge