Merge branch 'wip-mdl-54574' of https://github.com/rajeshtaneja/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 20 May 2016 01:07:54 +0000 (09:07 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 20 May 2016 01:07:54 +0000 (09:07 +0800)

Trivial merge