Merge branch 'wip-MDL-58665-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 2 May 2017 01:00:07 +0000 (09:00 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 2 May 2017 01:00:07 +0000 (09:00 +0800)

Trivial merge