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

Trivial merge