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

Trivial merge