Merge branch 'MDL-69704-master' of git://github.com/sarjona/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 5 Oct 2020 15:13:08 +0000 (23:13 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 5 Oct 2020 15:13:08 +0000 (23:13 +0800)

Trivial merge