Merge branch 'MDL-68973' of https://github.com/stronk7/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 10 Jun 2020 08:13:57 +0000 (16:13 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 10 Jun 2020 08:13:57 +0000 (16:13 +0800)

Trivial merge