Merge branch 'MDL-69993-310' of git://github.com/paulholden/moodle into MOODLE_310_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Oct 2020 09:42:51 +0000 (10:42 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Oct 2020 09:42:51 +0000 (10:42 +0100)

Trivial merge