Merge branch 'MDL-69260_master' of git://github.com/adpe/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 27 Jul 2020 02:53:23 +0000 (10:53 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 27 Jul 2020 02:53:23 +0000 (10:53 +0800)

Trivial merge