Merge branch 'MDL-51445_m31v1' of https://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 4 Jan 2016 01:20:31 +0000 (09:20 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 4 Jan 2016 01:20:31 +0000 (09:20 +0800)

Trivial merge