Merge branch 'MDL-66875-master' of git://github.com/lucaboesch/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Feb 2020 18:02:26 +0000 (19:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Feb 2020 18:02:26 +0000 (19:02 +0100)

Trivial merge