Merge branch 'MDL-61533-master-enfix' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 2 Mar 2018 00:42:45 +0000 (01:42 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 2 Mar 2018 00:42:45 +0000 (01:42 +0100)

Trivial merge