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

Trivial merge