Merge branch 'MDL-67910-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 10 Apr 2020 09:10:16 +0000 (11:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 10 Apr 2020 09:10:16 +0000 (11:10 +0200)

Trivial merge