Merge branch 'wip-MDL-58138-fix' of https://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 20 Apr 2017 05:54:43 +0000 (13:54 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 20 Apr 2017 05:54:43 +0000 (13:54 +0800)

Trivial merge