Merge branch 'MDL-61098-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jan 2018 20:06:13 +0000 (21:06 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jan 2018 20:06:13 +0000 (21:06 +0100)

Trivial merge