Merge branch 'MDL-68579-master' of git://github.com/cescobedo/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 May 2020 21:13:45 +0000 (23:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 May 2020 21:13:45 +0000 (23:13 +0200)

Trivial merge