Merge branch 'MDL-69505-310' of https://github.com/snake/moodle into MOODLE_310_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Aug 2020 07:34:48 +0000 (15:34 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Aug 2020 23:28:27 +0000 (07:28 +0800)

Trivial merge