Merge branch 'MDL-69367-39' of https://github.com/paulholden/moodle into MOODLE_39_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Aug 2020 14:29:09 +0000 (16:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Aug 2020 14:29:09 +0000 (16:29 +0200)

Trivial merge