Merge branch 'MDL-71837' of git://github.com/paulholden/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 24 Jun 2021 02:58:12 +0000 (10:58 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 24 Jun 2021 02:58:12 +0000 (10:58 +0800)

Trivial merge