Merge branch 'MDL-43620_m31v2' of https://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jan 2016 01:38:45 +0000 (09:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jan 2016 01:38:45 +0000 (09:38 +0800)

Trivial merge