Merge branch 'wip-MDL-56614-fix' of https://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 7 Dec 2016 06:56:49 +0000 (14:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 7 Dec 2016 06:56:49 +0000 (14:56 +0800)

Trivial merge