Merge branch 'MDL-69106-master' of git.in.moodle.com:cameron/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Jul 2020 06:13:22 +0000 (14:13 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Jul 2020 06:13:22 +0000 (14:13 +0800)

Trivial merge