Merge branch 'MDL-61975-master' of git://github.com/zig-moodle/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 20 Apr 2018 00:04:18 +0000 (02:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 20 Apr 2018 00:04:18 +0000 (02:04 +0200)

Trivial merge