Merge branch 'MDL-70139-310' of git://github.com/sarjona/moodle into MOODLE_310_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 6 Nov 2020 17:56:00 +0000 (18:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 6 Nov 2020 17:56:00 +0000 (18:56 +0100)

Trivial merge