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

Trivial merge