Merge branch 'MDL-54655_m32v1' of https://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 31 May 2016 05:29:48 +0000 (13:29 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 31 May 2016 05:29:48 +0000 (13:29 +0800)

Trivial merge