Merge branch 'MDL-63870' of https://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Jan 2019 23:09:27 +0000 (00:09 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Jan 2019 23:09:27 +0000 (00:09 +0100)

Trivial merge