Merge branch 'MDL-63716-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Nov 2018 03:20:54 +0000 (11:20 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Nov 2018 03:20:54 +0000 (11:20 +0800)

Trivial merge