Merge branch 'MDL-68666-master' of git://github.com/bmbrands/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 13 Aug 2020 07:20:03 +0000 (15:20 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 13 Aug 2020 07:20:03 +0000 (15:20 +0800)

Trivial merge