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

Trivial merge