Merge branch 'MDL-70326' of https://github.com/durzo/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 3 Dec 2020 03:53:53 +0000 (11:53 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 3 Dec 2020 03:53:53 +0000 (11:53 +0800)

Trivial merge