Merge branch 'MDL-70073-master' of git://github.com/peterRd/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 2 Nov 2020 05:57:21 +0000 (13:57 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 2 Nov 2020 05:57:21 +0000 (13:57 +0800)

Trivial merge