Merge branch 'MDL-62980-39' of https://github.com/paulholden/moodle into MOODLE_39_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Aug 2020 10:38:25 +0000 (12:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Aug 2020 10:38:25 +0000 (12:38 +0200)

Trivial merge