Merge branch 'MDL-67513' of https://github.com/NeillM/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 Nov 2020 00:22:51 +0000 (08:22 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 Nov 2020 00:22:51 +0000 (08:22 +0800)

Trivial merge