Merge branch 'MDL-66721-master' of git://github.com/bmbrands/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 14 Jan 2020 06:06:57 +0000 (14:06 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 14 Jan 2020 06:06:57 +0000 (14:06 +0800)

Trivial merge