Merge branch 'MDL-69158-master' of git://github.com/lucaboesch/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 6 Jul 2020 04:11:10 +0000 (12:11 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 6 Jul 2020 04:11:10 +0000 (12:11 +0800)

Trivial merge