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

Trivial merge