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

Trivial merge