Merge branch 'MDL_71012_master' of https://github.com/jessansell/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 19 Apr 2021 00:47:50 +0000 (08:47 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 19 Apr 2021 00:47:50 +0000 (08:47 +0800)

Trivial merge