Merge branch 'MDL-58596-master' of git://github.com/vmdef/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Jan 2019 08:14:58 +0000 (16:14 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Jan 2019 08:14:58 +0000 (16:14 +0800)

Trivial merge