Merge branch 'MDL-69740_310' of https://github.com/timhunt/moodle into MOODLE_310_STABLE
authorJun Pataleta <jun@moodle.com>
Fri, 9 Oct 2020 03:56:44 +0000 (11:56 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 9 Oct 2020 03:56:44 +0000 (11:56 +0800)

Trivial merge