Merge branch 'MDL-64252-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Mar 2019 21:34:50 +0000 (22:34 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Mar 2019 21:34:50 +0000 (22:34 +0100)

Trivial merge