Merge branch 'MDL-68995' of https://github.com/paulholden/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 10 Jun 2020 00:53:21 +0000 (08:53 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 10 Jun 2020 00:53:21 +0000 (08:53 +0800)

Trivial merge