Merge branch 'MDL-69493' of https://github.com/paulholden/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 22 Aug 2020 15:04:33 +0000 (17:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 22 Aug 2020 15:04:33 +0000 (17:04 +0200)

Trivial merge