Merge branch 'MDL-69156_master' of https://github.com/ffhs/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 30 Oct 2020 03:51:48 +0000 (11:51 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 30 Oct 2020 03:51:48 +0000 (11:51 +0800)

Trivial merge