Merge branch 'MDL-68285-master' of git://github.com/cescobedo/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Apr 2020 05:25:48 +0000 (13:25 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Apr 2020 05:25:48 +0000 (13:25 +0800)

Trivial merge