Merge branch 'MDL-68542-39' of https://github.com/JayChurchward/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 May 2020 03:50:04 +0000 (11:50 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 May 2020 03:50:04 +0000 (11:50 +0800)

Trivial merge