Merge branch 'MDL-68266-master' of git://github.com/bmbrands/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 4 May 2020 07:33:14 +0000 (15:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 4 May 2020 07:33:14 +0000 (15:33 +0800)

Trivial merge