Merge branch 'MDL-39060-master' of git://github.com/zig-moodle/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Mar 2018 11:44:47 +0000 (13:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Mar 2018 16:16:31 +0000 (18:16 +0200)

Trivial merge