Merge branch 'wip-MDL-62068-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 May 2018 03:39:44 +0000 (11:39 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 May 2018 03:39:44 +0000 (11:39 +0800)

Trivial merge