Merge branch 'MDL-70094-310' of https://github.com/SangNguyen2601/moodle into MOODLE_...
authorJun Pataleta <jun@moodle.com>
Thu, 19 Nov 2020 01:36:53 +0000 (09:36 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 19 Nov 2020 01:36:53 +0000 (09:36 +0800)

Trivial merge