Merge branch 'MDL-43334-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Aug 2018 22:11:16 +0000 (00:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Aug 2018 22:11:16 +0000 (00:11 +0200)

Trivial merge