Merge branch 'MDL-68615' of https://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 May 2020 08:07:28 +0000 (10:07 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 May 2020 08:07:28 +0000 (10:07 +0200)

Trivial merge