Merge branch 'MDL-61203_m35v3' of git://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 23 Jan 2018 03:30:09 +0000 (11:30 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 23 Jan 2018 03:30:09 +0000 (11:30 +0800)

Trivial merge