Merge branch 'MDL-68256' of https://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 6 Apr 2020 07:05:41 +0000 (15:05 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 6 Apr 2020 07:05:41 +0000 (15:05 +0800)

Trivial merge