Merge branch 'wip-mdl-56994' of https://github.com/rajeshtaneja/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 Nov 2016 03:22:30 +0000 (11:22 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 Nov 2016 03:22:30 +0000 (11:22 +0800)

Trivial merge