Merge branch 'MDL-70897-master' of git://github.com/kabalin/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 29 Apr 2021 02:18:01 +0000 (10:18 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 29 Apr 2021 02:18:01 +0000 (10:18 +0800)

Trivial merge