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

Trivial merge