Merge branch 'MDL-69257-310' of git://github.com/mihailges/moodle into MOODLE_310_STABLE
authorJun Pataleta <jun@moodle.com>
Fri, 9 Oct 2020 03:12:16 +0000 (11:12 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 9 Oct 2020 03:12:16 +0000 (11:12 +0800)

Trivial merge