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

Trivial merge