Merge branch 'MDL-68436' of https://github.com/timhunt/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 16 Jun 2020 06:38:44 +0000 (14:38 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 16 Jun 2020 06:38:44 +0000 (14:38 +0800)

Trivial merge