Merge branch 'MDL-69526-master' of git://github.com/lucaboesch/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Nov 2020 06:52:58 +0000 (14:52 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Nov 2020 06:52:58 +0000 (14:52 +0800)

Trivial merge