Merge branch 'MDL-69658-310' of https://github.com/paulholden/moodle into MOODLE_310_...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Sep 2020 20:56:42 +0000 (22:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Sep 2020 20:56:42 +0000 (22:56 +0200)

Trivial merge