Merge branch 'MDL-65448-310' of git://github.com/lucaboesch/moodle into MOODLE_310_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 19 Oct 2020 02:07:45 +0000 (10:07 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 19 Oct 2020 02:07:45 +0000 (10:07 +0800)

Trivial merge