Merge branch 'wip-MDL-61424-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Aug 2018 00:18:58 +0000 (08:18 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Aug 2018 00:18:58 +0000 (08:18 +0800)

Trivial merge