Merge branch 'MDL-69006-master' of git://github.com/bmbrands/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 11 Jun 2020 04:59:26 +0000 (12:59 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 11 Jun 2020 04:59:26 +0000 (12:59 +0800)

Trivial merge