Merge branch 'wip-mdl-54940' of https://github.com/rajeshtaneja/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jun 2016 11:00:33 +0000 (19:00 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jun 2016 11:00:33 +0000 (19:00 +0800)

Trivial merge