Merge branch 'MDL-64161-master' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 27 Nov 2018 03:36:42 +0000 (11:36 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 27 Nov 2018 03:36:42 +0000 (11:36 +0800)

Trivial merge