Merge branch 'MDL-68444-master' of git://github.com/rezaies/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Aug 2020 17:12:59 +0000 (19:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Aug 2020 17:12:59 +0000 (19:12 +0200)

Trivial merge