Merge branch 'MDL-67654' of https://github.com/paulholden/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Oct 2020 23:57:15 +0000 (07:57 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Oct 2020 23:57:15 +0000 (07:57 +0800)

Trivial merge