Merge branch 'MDL-68279' of https://github.com/paulholden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Apr 2020 22:27:44 +0000 (00:27 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Apr 2020 22:27:44 +0000 (00:27 +0200)

Trivial merge