Merge branch 'wip-mdl-55043' of https://github.com/rajeshtaneja/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 7 Jul 2016 03:27:58 +0000 (11:27 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 7 Jul 2016 03:27:58 +0000 (11:27 +0800)

Trivial merge