Merge branch 'MDL-62008-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Feb 2019 16:23:41 +0000 (17:23 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Feb 2019 16:23:41 +0000 (17:23 +0100)

Trivial merge