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

Trivial merge