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

Trivial merge