Merge branch 'MDL-69448' of https://github.com/paulholden/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Sep 2020 21:25:49 +0000 (23:25 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Sep 2020 21:25:49 +0000 (23:25 +0200)

Trivial merge