Merge branch 'MDL-64409' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Jan 2019 22:58:34 +0000 (06:58 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Jan 2019 22:58:34 +0000 (06:58 +0800)

Trivial merge