Merge branch 'MDL-69815-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 28 Oct 2020 06:19:32 +0000 (14:19 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 28 Oct 2020 06:19:32 +0000 (14:19 +0800)

Trivial merge