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

Trivial merge