Merge branch 'wip-MDL-50586-master-fix' of https://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 17 Aug 2016 05:22:50 +0000 (13:22 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 17 Aug 2016 05:22:50 +0000 (13:22 +0800)

Trivial merge