Merge branch 'MDL-68076-master-4' of git://github.com/rezaies/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 4 Jun 2020 14:31:39 +0000 (16:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 4 Jun 2020 14:31:39 +0000 (16:31 +0200)

Trivial merge