Merge branch 'MDL-64417' of https://github.com/paulholden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Apr 2020 21:55:22 +0000 (23:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Apr 2020 21:55:22 +0000 (23:55 +0200)

Trivial merge