Merge branch 'MDL-64420-2' of https://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Feb 2019 11:56:18 +0000 (12:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Feb 2019 11:56:18 +0000 (12:56 +0100)

Trivial merge