Merge branch 'MDL-67189-master' of git://github.com/dpalou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Mar 2020 10:28:44 +0000 (11:28 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Mar 2020 10:28:44 +0000 (11:28 +0100)

Trivial merge