Merge branch 'MDL-58006-master' of git://github.com/zig-moodle/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 18:57:33 +0000 (19:57 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 18:57:33 +0000 (19:57 +0100)

Trivial merge