Merge branch 'MDL-67995-master' of git://github.com/cescobedo/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Apr 2020 17:07:12 +0000 (19:07 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Apr 2020 17:07:12 +0000 (19:07 +0200)

Trivial merge