Merge branch 'MDL-52560-m' of https://github.com/micaherne/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Jan 2016 06:46:31 +0000 (14:46 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 09:31:08 +0000 (09:31 +0000)

Trivial merge