Merge branch 'MDL-67991-master' of git://github.com/aanabit/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 13 Aug 2020 00:54:35 +0000 (08:54 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 13 Aug 2020 00:54:35 +0000 (08:54 +0800)

Trivial merge