Merge branch 'MDL-61205_m35v1' of git://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 15 Jan 2018 06:17:01 +0000 (14:17 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 15 Jan 2018 06:17:01 +0000 (14:17 +0800)

Trivial merge