Merge branch 'MDL-69712-310' of git://github.com/aanabit/moodle into MOODLE_310_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 Oct 2020 14:25:35 +0000 (16:25 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 Oct 2020 14:25:35 +0000 (16:25 +0200)

Trivial merge