Merge branch 'MDL-62763-master-enfix' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Jul 2018 18:09:07 +0000 (20:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Jul 2018 18:09:07 +0000 (20:09 +0200)

Trivial merge