Merge branch 'wip-mdl-53381' of https://github.com/rajeshtaneja/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 Apr 2016 03:53:41 +0000 (11:53 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 Apr 2016 03:53:41 +0000 (11:53 +0800)

Trivial merge