Merge branch 'MDL-60827-39' of git://github.com/mihailges/moodle into MOODLE_39_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Jul 2020 22:17:26 +0000 (00:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Jul 2020 22:17:26 +0000 (00:17 +0200)

Trivial merge