Merge branch 'MDL-62181-master-enfix' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Apr 2018 17:09:35 +0000 (19:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Apr 2018 17:09:35 +0000 (19:09 +0200)

Trivial merge