Merge branch 'MDL66035_master' of https://github.com/jwalits/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 28 Apr 2020 12:04:34 +0000 (20:04 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 28 Apr 2020 12:04:34 +0000 (20:04 +0800)

Trivial merge