Merge branch 'MDL-55299-39' of git://github.com/ferranrecio/moodle into MOODLE_39_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Aug 2020 10:34:06 +0000 (12:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Aug 2020 10:34:06 +0000 (12:34 +0200)

Trivial merge