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

Trivial merge