Merge branch 'MDL-68165' of https://github.com/stronk7/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 2 Apr 2020 00:42:45 +0000 (08:42 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 2 Apr 2020 00:42:45 +0000 (08:42 +0800)

Trivial merge