Merge branch 'MDL-69964' of git://github.com/paulholden/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Nov 2020 02:21:27 +0000 (10:21 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Nov 2020 02:21:27 +0000 (10:21 +0800)

Trivial merge