Merge branch 'MDL-68178-master' of git://github.com/mihailges/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 22 Jul 2020 04:59:09 +0000 (12:59 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 22 Jul 2020 04:59:09 +0000 (12:59 +0800)

Trivial merge