Merge branch 'wip-mdl-52996' of https://github.com/rajeshtaneja/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 24 Feb 2016 02:38:17 +0000 (10:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 24 Feb 2016 02:38:17 +0000 (10:38 +0800)

Trivial merge