Merge branch 'MDL-68615' of https://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 May 2020 22:58:26 +0000 (00:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 May 2020 22:58:26 +0000 (00:58 +0200)

Trivial merge