Merge branch 'MDL-68270-master' of git://github.com/bmbrands/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 26 May 2020 00:02:50 +0000 (08:02 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 26 May 2020 00:02:50 +0000 (08:02 +0800)

Trivial merge