Merge branch 'MDL-70033-master-2' of git://github.com/mickhawkins/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 3 Nov 2020 04:02:08 +0000 (12:02 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 3 Nov 2020 04:02:08 +0000 (12:02 +0800)

Trivial merge