Merge branch 'MDL-68217-master' of git://github.com/lucaboesch/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 May 2020 04:50:15 +0000 (12:50 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 May 2020 04:50:15 +0000 (12:50 +0800)

Trivial merge