Merge branch 'MDL-69815-310' of git://github.com/andrewnicols/moodle into MOODLE_310_...
authorJun Pataleta <jun@moodle.com>
Wed, 28 Oct 2020 06:19:23 +0000 (14:19 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 28 Oct 2020 06:19:23 +0000 (14:19 +0800)

Trivial merge