Merge branch 'MDL-69353' of https://github.com/paulholden/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 12 Aug 2020 03:21:48 +0000 (11:21 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 12 Aug 2020 03:21:48 +0000 (11:21 +0800)

Trivial merge