Merge branch 'MDL-49231-master-fix' of https://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 Jan 2016 07:03:55 +0000 (15:03 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 Jan 2016 07:03:55 +0000 (15:03 +0800)

Trivial merge