Merge branch 'wip-mdl-54588' of https://github.com/rajeshtaneja/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 May 2016 04:05:34 +0000 (12:05 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 May 2016 04:05:34 +0000 (12:05 +0800)

Trivial merge