Merge branch 'MDL-69134-39' of git://github.com/andrewnicols/moodle into MOODLE_39_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jul 2020 18:53:22 +0000 (20:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jul 2020 18:53:22 +0000 (20:53 +0200)

Trivial merge