Merge branch 'MDL-70072-310' of git://github.com/rezaies/moodle into MOODLE_310_STABLE
authorJun Pataleta <jun@moodle.com>
Wed, 11 Nov 2020 14:09:07 +0000 (22:09 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 11 Nov 2020 14:09:07 +0000 (22:09 +0800)

Trivial merge