Merge branch 'MDL-52052-master' of git://github.com/mihailges/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 22 Jul 2020 05:47:14 +0000 (13:47 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 22 Jul 2020 05:47:14 +0000 (13:47 +0800)

Trivial merge