Merge branch 'MDL-69241-master' of git://github.com/mickhawkins/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 13 Aug 2020 00:27:01 +0000 (08:27 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 13 Aug 2020 00:27:01 +0000 (08:27 +0800)

Trivial merge