Merge branch 'MDL-70089_310' of https://github.com/stronk7/moodle into MOODLE_310_STABLE
authorJun Pataleta <jun@moodle.com>
Wed, 4 Nov 2020 05:05:47 +0000 (13:05 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 4 Nov 2020 05:05:47 +0000 (13:05 +0800)

Trivial merge