Merge branch 'MDL-69130-master-enfix' of git://github.com/mudrd8mz/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 2 Jul 2020 04:07:58 +0000 (12:07 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 2 Jul 2020 04:07:58 +0000 (12:07 +0800)

Trivial merge