Merge branch 'MDL-68875' of https://github.com/stronk7/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 3 Jun 2020 04:28:51 +0000 (12:28 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 3 Jun 2020 04:28:51 +0000 (12:28 +0800)

Trivial merge