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

Trivial merge