Merge branch 'MDL-69586' of https://github.com/paulholden/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 1 Oct 2020 15:12:24 +0000 (17:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 1 Oct 2020 15:12:24 +0000 (17:12 +0200)

Trivial merge