Merge branch 'MDL-68896' of git://github.com/danmarsden/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 Nov 2020 01:32:46 +0000 (09:32 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 Nov 2020 01:32:46 +0000 (09:32 +0800)

Trivial merge