Merge branch 'MDL-67514' of https://github.com/paulholden/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 2 Dec 2020 08:20:37 +0000 (16:20 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 2 Dec 2020 08:20:37 +0000 (16:20 +0800)

Trivial merge