Merge branch 'MDL-64400-master' of git://github.com/aanabit/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Jan 2019 00:27:06 +0000 (08:27 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Jan 2019 00:27:06 +0000 (08:27 +0800)

Trivial merge