Merge branch 'MDL-69273-39' of git://github.com/andrewnicols/moodle into MOODLE_39_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Aug 2020 08:59:37 +0000 (10:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Aug 2020 08:59:37 +0000 (10:59 +0200)

Trivial merge