Merge branch 'MDL-68300' of https://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 2 Apr 2020 11:13:36 +0000 (13:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 2 Apr 2020 11:13:36 +0000 (13:13 +0200)

Trivial merge