Merge branch 'MDL-58064-master-enfix' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Mar 2017 15:36:54 +0000 (16:36 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Mar 2017 15:36:54 +0000 (16:36 +0100)

Trivial merge