Merge branch 'MDL-69116-master' of git://github.com/rezaies/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Sep 2020 21:14:19 +0000 (23:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Sep 2020 21:14:19 +0000 (23:14 +0200)

Trivial merge