Merge branch 'MDL-69160-39' of git://github.com/andrewnicols/moodle into MOODLE_39_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jul 2020 21:29:36 +0000 (23:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jul 2020 21:29:36 +0000 (23:29 +0200)

Trivial merge