Merge branch 'MDL-67382-master' of git://github.com/vmdef/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 13 Jan 2020 04:59:28 +0000 (12:59 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 13 Jan 2020 04:59:28 +0000 (12:59 +0800)

Trivial merge