Merge branch 'MDL-69995-310' of git://github.com/lucaboesch/moodle into MOODLE_310_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 26 Oct 2020 08:00:38 +0000 (16:00 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 26 Oct 2020 08:00:38 +0000 (16:00 +0800)

Trivial merge