Merge branch 'MDL-54115_m31v1' of https://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 10 May 2016 04:06:36 +0000 (12:06 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 May 2016 10:36:16 +0000 (18:36 +0800)

Trivial merge