Merge branch 'MDL-66810-master' of git://github.com/peterRd/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 27 Aug 2020 02:21:30 +0000 (10:21 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 27 Aug 2020 02:21:30 +0000 (10:21 +0800)

Trivial merge