Merge branch 'MDL-69367' of https://github.com/paulholden/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Aug 2020 14:26:59 +0000 (16:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Aug 2020 14:26:59 +0000 (16:26 +0200)

Trivial merge