Merge branch 'MDL-65428-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 26 Apr 2019 17:45:25 +0000 (19:45 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 26 Apr 2019 17:45:25 +0000 (19:45 +0200)

Trivial merge