Merge branch 'MDL-70310-310' of git://github.com/ilyatregubov/moodle into MOODLE_310_...
authorJun Pataleta <jun@moodle.com>
Fri, 8 Jan 2021 06:47:14 +0000 (14:47 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 8 Jan 2021 06:47:14 +0000 (14:47 +0800)

Trivial merge