Merge branch 'MDL-66135' of https://github.com/paulholden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 1 May 2020 14:07:56 +0000 (16:07 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 1 May 2020 14:07:56 +0000 (16:07 +0200)

Trivial merge