Merge branch 'MDL-68971' of https://github.com/timhunt/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 17 Jun 2020 03:36:12 +0000 (11:36 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 17 Jun 2020 03:36:12 +0000 (11:36 +0800)

Trivial merge