Merge branch 'MDL-70146_310' of https://github.com/stronk7/moodle into MOODLE_310_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Nov 2020 02:01:19 +0000 (10:01 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Nov 2020 02:01:19 +0000 (10:01 +0800)

Trivial merge