Merge branch 'MDL-70909-master' of git://github.com/ferranrecio/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 28 Apr 2021 02:20:03 +0000 (10:20 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 28 Apr 2021 02:20:03 +0000 (10:20 +0800)

Trivial merge