Merge branch 'MDL-69813-310' of https://github.com/paulholden/moodle into MOODLE_310_...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 14 Oct 2020 20:47:12 +0000 (22:47 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 14 Oct 2020 20:47:12 +0000 (22:47 +0200)

Trivial merge