Merge branch 'MDL-48985_m31v1' of https://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jan 2016 04:56:26 +0000 (12:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jan 2016 04:56:26 +0000 (12:56 +0800)

Trivial merge