Merge branch 'MDL-71919-master-fix' of https://github.com/cescobedo/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 8 Jul 2021 08:31:19 +0000 (16:31 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 Jul 2021 21:30:35 +0000 (23:30 +0200)

Trivial merge