Merge branch 'wip-mdl-56614' of https://github.com/rajeshtaneja/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 7 Dec 2016 01:42:20 +0000 (09:42 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 7 Dec 2016 01:42:20 +0000 (09:42 +0800)

Trivial merge