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

Trivial merge