Merge branch 'MDL-60854-master' of git://github.com/aanabit/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Dec 2019 23:29:02 +0000 (00:29 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Dec 2019 23:29:02 +0000 (00:29 +0100)

Trivial merge