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

Trivial merge