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

Trivial merge