Merge branch 'MDL-68271-master' of git://github.com/sarjona/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 11 May 2020 01:10:40 +0000 (09:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 11 May 2020 01:10:40 +0000 (09:10 +0800)

Trivial merge