Merge branch 'MDL-70081-master' of git://github.com/jleyva/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Nov 2020 00:24:45 +0000 (01:24 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Nov 2020 00:24:45 +0000 (01:24 +0100)

Trivial merge