Merge branch 'MDL-68618' of https://github.com/paulholden/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 12 Aug 2020 05:39:20 +0000 (13:39 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 12 Aug 2020 05:39:20 +0000 (13:39 +0800)

Trivial merge