Merge branch 'wip-mdl-54000-fix' of https://github.com/rajeshtaneja/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 May 2016 01:41:30 +0000 (09:41 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 May 2016 01:41:30 +0000 (09:41 +0800)

Trivial merge