Merge branch 'wip-MDL-50670-master-fix' of https://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 5 May 2017 06:55:22 +0000 (14:55 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 5 May 2017 06:55:22 +0000 (14:55 +0800)

Trivial merge