Merge branch 'MDL-67499' of git://github.com/paulholden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Apr 2020 10:49:14 +0000 (12:49 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Apr 2020 10:49:14 +0000 (12:49 +0200)

Trivial merge