Merge branch 'MDL-69360-master' of git://github.com/NoelDeMartin/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Sep 2020 02:44:31 +0000 (10:44 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Sep 2020 02:44:31 +0000 (10:44 +0800)

Trivial merge