Merge branch 'mdl57404' of https://github.com/egiles/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2018 23:02:30 +0000 (01:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2018 23:02:30 +0000 (01:02 +0200)

Trivial merge