Merge branch 'MDL-68656-master' of https://github.com/catalyst/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 May 2020 23:13:22 +0000 (01:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 May 2020 23:13:22 +0000 (01:13 +0200)

Trivial merge