Merge branch 'MDL-68191' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Apr 2020 18:18:25 +0000 (20:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Apr 2020 18:18:25 +0000 (20:18 +0200)

Trivial merge