Merge branch 'MDL-61218-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 28 Jan 2018 23:10:25 +0000 (00:10 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 28 Jan 2018 23:10:25 +0000 (00:10 +0100)

Trivial merge