Merge branch 'MDL-57409-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Jan 2017 19:52:04 +0000 (20:52 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Jan 2017 19:52:04 +0000 (20:52 +0100)

Trivial merge