Merge branch 'wip-mdl-56603' of https://github.com/rajeshtaneja/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 17 Nov 2016 00:51:47 +0000 (08:51 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 17 Nov 2016 00:51:47 +0000 (08:51 +0800)

Trivial merge