Merge branch 'MDL-66648-310' of https://github.com/paulholden/moodle into MOODLE_310_...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Sep 2020 21:36:22 +0000 (23:36 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Sep 2020 21:36:22 +0000 (23:36 +0200)

Trivial merge