Merge branch 'MDL-69704-310' of git://github.com/sarjona/moodle into MOODLE_310_STABLE
authorJun Pataleta <jun@moodle.com>
Mon, 5 Oct 2020 15:12:57 +0000 (23:12 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 5 Oct 2020 15:12:57 +0000 (23:12 +0800)

Trivial merge