Merge branch 'wip-mdl-56981' of https://github.com/rajeshtaneja/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 16 Nov 2016 06:00:40 +0000 (14:00 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 16 Nov 2016 06:00:40 +0000 (14:00 +0800)

Trivial merge