Merge branch 'wip-MDL-56864-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Dec 2017 05:36:32 +0000 (13:36 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Dec 2017 05:36:32 +0000 (13:36 +0800)

Trivial merge