Merge branch 'MDL-67971-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Mar 2020 18:02:22 +0000 (19:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Mar 2020 18:02:22 +0000 (19:02 +0100)

Trivial merge