Merge branch 'MDL-67842' of https://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Feb 2020 21:44:24 +0000 (22:44 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Feb 2020 21:44:24 +0000 (22:44 +0100)

Trivial merge