Merge branch 'MDL-57133-master-enfix' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Nov 2016 21:36:29 +0000 (22:36 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Nov 2016 21:36:29 +0000 (22:36 +0100)

Trivial merge