Merge branch 'MDL-71717' of git://github.com/paulholden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Jun 2021 22:18:45 +0000 (00:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Jun 2021 22:18:45 +0000 (00:18 +0200)

Trivial merge