Merge branch 'MDL-43827-master' of git://github.com/mihailges/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Dec 2017 23:25:28 +0000 (00:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Dec 2017 23:25:28 +0000 (00:25 +0100)

Trivial merge