Merge branch 'wip_MDL-69491_m39' of git://github.com/gjb2048/moodle into MOODLE_39_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Sep 2020 22:27:43 +0000 (00:27 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Sep 2020 22:27:43 +0000 (00:27 +0200)

Trivial merge