Merge branch 'MDL-69095-master' of git://github.com/jleyva/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Aug 2020 22:19:43 +0000 (00:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Aug 2020 22:19:43 +0000 (00:19 +0200)

Trivial merge