Merge branch 'MDL-68569' of https://github.com/paulholden/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Aug 2020 03:39:51 +0000 (11:39 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Aug 2020 23:26:01 +0000 (07:26 +0800)

Trivial merge