Merge branch 'wip-MDL-61876-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 4 May 2018 00:03:48 +0000 (08:03 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 4 May 2018 00:03:48 +0000 (08:03 +0800)

Trivial merge