Merge branch 'MDL-68099-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 26 May 2020 03:29:48 +0000 (11:29 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 26 May 2020 03:29:48 +0000 (11:29 +0800)

Trivial merge