Merge branch 'MDL-64497-master' of https://github.com/sammarshallou/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Jan 2019 04:25:34 +0000 (12:25 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Jan 2019 04:25:34 +0000 (12:25 +0800)

Trivial merge