Merge branch 'MDL-69319-master' of https://github.com/snake/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Jul 2020 22:16:09 +0000 (00:16 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Jul 2020 22:16:09 +0000 (00:16 +0200)

Trivial merge