Merge branch 'MDL-69975_310' of https://github.com/stronk7/moodle into MOODLE_310_STABLE
authorJun Pataleta <jun@moodle.com>
Mon, 2 Nov 2020 16:00:25 +0000 (00:00 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 2 Nov 2020 16:00:25 +0000 (00:00 +0800)

Trivial merge