Merge branch 'MDL-64818_master' of git://github.com/gjb2048/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 10 Aug 2020 10:54:30 +0000 (18:54 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 10 Aug 2020 10:54:30 +0000 (18:54 +0800)

Trivial merge